I would purchase/order two guns(same manufacturer), both with screw chokes.
A Target gun should weigh a lot more than an upland gun to allow you to better handle the recoil and conversely you don't want to tote a Target gun while upland hunting.
The weights and swings will be different due to inertia but that it not a problem. I do have my Target gun at 28" to better match the length of my upland guns.-Dick