Do you need an OS included in the build?
Nobody is going to make your mind up for you, only offer suggestions.
Can you post a list of re-usable items from your previous build, including the HDD that has seen better days?
To be honest, I think my build is the most sane (albeit not the best gfx card), people are suggesting OTT motherboards and GFX cards (I admit my case was OTT

)
Take a look at some cases, ask more questions. Get to the point where you feel comfortable with the final build choice.
Might seem like hard work and a pain, but going back to the original post, you'll be far happier that going pre-built or laptop