I'm going to go against the grain and say if you only add your current fish with some good filtration the 150 might work, though if your srd is like mine forget it.
SRD?
I am going to have a couple of hiding spots as well, interestingly everyone seems to get along pretty well with the exception being the Oscar and the "Texas" and even they mostly posture. I am thinking about using silicone to attach some slate shelves to the tank and create some vertical seperation as well.