Yeah, the zebra Danios ideally like it a little on the cooler side of average, and the rams on the hotter side, so you are best keeping them in different tanks for the long term. As others have suggested Discus go well with Rams but it depends on your budget! Whilst they are not quite as hard to keep as some believe, they are still a bit tricky and you need to be careful what else goes in with them.
If your rams are surviving well, I'd get a few more, and some appropriate tetras, cardinals, Bentosi, black phantom, lemon, the list goes on. Maybe some hatchets for the top and corys for the bottom, but bear in mind the slightly higher temps needed. Sterbai cory might be a good bet. Not sure about the gobies, I'd be tempted to trade them if it was me.
Other cichlid ideas could be Angelfish, Keyholes and Cockatoo cichlids, all should work well in that size a tank with existing Rams.
Sent from my iPhone using Aquarium Advice