Yeah, think another brand might be better indeed.
Is there also a CPU that you recommend?
I think one of the FX 4xxx four core CPUs might be quite an upgrade from what you've had and is still only rated at 95W TDP. Just make sure your board supports the FX series. If you do get a new board look at the AM3+ 970 chipset boards.
And that fluid tip I will do that indeed I had with other products too that they just send the same thing back with a fix.
Or, without any fix. Believe me, I've been there and done that.