That sounds like a reasonable plan.
Before you spend any money, go through and check all the usual suspects (mounts on backwards, screws tightened and not too long, etc...).
Personally, I would go with Burris Signature Zee rings with the inserts to start off boresighted with my scope adjustments approximately centered, but if you prefer windage bases and rings, go for it.