If anyone's still following this thread... here's my new setup:
Tippmann X-7 Phenom
Killjoy Industries ROC Stock - Has an offset rail so you can actually use your sights.
Folding front grip
42mm red dot
I haven't decided what front shroud I want to pick up yet.