Don't forget the Thread Lock on those screws. I, too, replace them with cap heads and I almost always use the SIG hardware. It is simply better stuff.

Best of luck and remember...bigger will look much different on final so keep the power on and don't let it stall.