2 500 watt heaters should be great, and a wave maker can help with water movement if you buy a pump that does not have the needed flow for your tank you setup. Make sure you think of the water flow and how it will move the water in the tank and keep the crap picked up and going out of the tank and into the sump and not cause dead spots where gunk and junk will settle.