And after doing all that work if it's not shooting up to par. Don't blame the rifle. If you are not used to shooting a rifle that light you could be the problem. It took me a couple hundred rounds with my Montana to get rid of all my bad habits. Tell you what though, that rifle did more for teaching me proper shooting form than any rifle I've ever owned. I no longer have mine but I'm glad I did get to play with one.
Good luck. Sounds like a great rifle.
22.125" at the very most.