I would say do what you are doing, upgrade graphics, power supply. If you want to upgrade the board, I think I'd find a new case also. Just seems like with PC's, manufacturers tend to put cheaper parts in them. Maybe I'm wrong, but I've seen too many new PC's failing a year or two out. Upgrading power supply is definitely a good idea in my opinion though.