Upgrade?

it definitely is but that includes motherboard aswell

Get the new power supply first, and if your motherboard still has issues, only then consider replacing it, because if you can last just a short few months, zen and kaby lake should be upon us for a worthwhile upgrade, since you'll need to buy a new motherboard for them anyways.