Since you are brainstorming.

What about both?

If there is the slightest bit of chance that you may want to allow a shorter person {wife, kids, etc} to use the rifle maybe take the "lemon" {it isn't, but you get the point...} and make lemonade?

I have read of and seen a picture of, but not handled, rifles with two buttplate/recoil pad setups, easily switched. A rifle already "too short" would be the perfect candidate for such a mod. I am not sure what sort of hardware is installed but there is an arrangement that allows the recoil pad to be switched without marring it.

Just an idea, but who knows, you may never have another rifle that could do such double-duty.