I can't blame ya there. After all the trouble my new rig has given me, I think next time I'll just shell out for a Falcon Northwest.
(then again, at the time I do finally upgrade, I will feel differently, ofcourse. :)
Still, returning it, and buying different parts is probably smart...