yeah get a better power supply. something by seasonic, pc power and cooling or xfx. the one you have is highly suspect in quality and you risk damaging your whole rig.
as for GPU's i am partial to nvidia but both GPU's are good. don't wait for volcanic islands....there is always something better coming and something to keep you waiting. just buy the best you can at the time your buying