Sounds like you may want to go the route of a new PC.
I ended up researching my various hardware options at places like Newegg while viewing their customer reviews and pricing. That gave me lots of ideas. Then I talked to someone at a local computer repair shop. After a few discussions and return trips to Newegg, I finally decided on what I wanted and had the local shop build me a custom computer.
So my advice... Whether you do it yourself or have someone do it for you, make it custom to your preference, and use a big case with plenty of room to breath and grow.