The only mainstream pc maker i might consider is HP, the rest, including alienware (dell) have stared using a lot proprietary parts once again. Look into buildredux or nzxt for a custom build if you don't want to do it yourself. There are others, but i know both of these companies do a decent job.