If you want to complete replace what you have I would get a 6000 and a single controller. If you just want a supplement I would get a 6060 and get rid of two maxijets, you cannot run the Streams on your wavemake- it will ruin them. It shouldn't be too much, but if you go with the 6060 I would keep two of your maxis just to keep some random flow.