Nice tank bro~! You can check out the Zero rodi unit at madpetz or the crystal di unit. These 2 are the more commonly used ones. You should get one if you are really getting an upgrade soon. As for now, stop using tap water and go get the life distilled water for your water change, 12 bottles of 1.5 litres for $6 only. I have been using it for the past 9 months, so far so good
As for your po4 test kits, go for the hanna checker, the most accurate po4 test kit imo..
Reef on~!