5 inches does seem like a lot. I think you have to take time off work and force yourself to spend more time on the range with that rifle. I know its a lot to ask, but I would shoot the devil out of it in all kinds of weather before I make two different sight adjustments.
Hmmm, I wonder if work will accept "need extended time off for load development" as reason to take an FMLA leave.