Yellow Watchman A Terror!


Does anyone else have problems with their yellow watchman goby being a terror? Mine has attacked my purple firefish and put a gash in it's side. He will attack anything that gets even close to his SIDE of the tank (where he has his "cave"). Do I have too small of a tank for him?
Stocking List:
2 Purple Firefish
1 B&W ocellaris
In a couple more months I plan on getting a flame angel and that will complete my fish stocking (I have a reef). Will the flame put him in his place?