Cleaner shrimp , as you found out the hard way, will not last w/ hawkfish.
AS far as 2 hawks in a tank, I have a flame and spotted(falco) in a 125 w/ no probs. They're great fish.
I think a falco or flame in a 15 or 20 s/b fine. Plenty of L/R needed.