Very often
(and I've seen this many times in person) a well crowded cichlid tank seems to be the way forward as everyone and everything becomes a ditherer... only drawback there is the fish won't show off to the best potential as they are all forced to behaviour un-naturally.
I feel containing and controlling the fishes behaviours is the way forward. To understand their psyche

and yes a good idea is to have a cooling off tank incase and also a good local store that'll take your un-controllable fish off your hands.