In my mind there are 2 categories as far as recomendeding a system goes.
"my budget is xxxx dollars, get me the best system i can get for this amount"
"Money is no object, get me the best system"
Now, OP may have meant to say the first one, which *MIGHT* mean he would be a contender for LabG clones. however, he's yet to give us a tangible dollar amount, so until that point, I'm going to recomend super overkill (and full warranty support) until they do. Thus, I say get real labs, powersofts, or itechs, with a very hefty power service install
OP has defined the room. I know you say upgrade the room bassthathz (and sticking hard and fast to category 2, your suggeston would be valid), but since its the only limitation that was described, we should stick to it.