Justin, definitely go with a 20 MOA Base.

And if you're interested, I have a 4-20 XTR-II SCR MIL I could probably cut you a deal on. Not in a hurry to move it but if you're interested when your rifle is ready drop me a line.