I'd ditch the birdcage flash hider and put a Noveske flaming pig on there if you're that concerned about muzzle flash. Nice build, and definitely go with the smaller optic.
I picked up a PWS CQB Comp today. I hope it helps minimize the flash and focus some of the noise forward. I will let you know after I take it to the range this weekend.