I say do it with the Non-FSB rail. Even though it might not be a clone correct build, Id be willing to bet the guys that use and have used the Block 2 upper would much rather have a non-FSB rail. As for the Warcomp, I would much prefer that over a SF4P, if it were on my duty gun.