Nice pickup and well thought out additions to the gun. I've recently tried the BCM Gunfighter grips and ditched all MOE grips in favor of them. My stocks are all on pos 2 (I think) so for my height and wingspan that's pretty choked up. The BCM grip helps to combat wrist fatigue with its relaxed grip angle.
That's nice S&W offered to fix the rail for you. What make is it? If you have the extra money at some point I'd recommend a cutout. Daniel Defense and Centurion both make carbine FSB cutouts that are solid as hell and would give you a lot more room for mounting lights, NVG, etc.
Examples of carbine cutouts with x300-type light placement at 12 o'clock
ETA: To give you more flexibility with the AN/PVS-14, a LaRue LT129 cantilever mount for the Aimpoint might help you out...
That's nice S&W offered to fix the rail for you. What make is it? If you have the extra money at some point I'd recommend a cutout. Daniel Defense and Centurion both make carbine FSB cutouts that are solid as hell and would give you a lot more room for mounting lights, NVG, etc.
Examples of carbine cutouts with x300-type light placement at 12 o'clock


ETA: To give you more flexibility with the AN/PVS-14, a LaRue LT129 cantilever mount for the Aimpoint might help you out...