You also have the option of a stem riser, then clamp your new stem onto It.

Those angle adjustable stems also get closer as you tilt them Up..

If you can get it down to a Bike Shop, you can test fit a bunch of choices
on and test ride it a bit.

open face threadless stems are a snap to swap out.

store inventory is easily augmented by their order book..