XD Mod.2 4" threaded barrel holster? Barrel Swap?

I have a 4" service model XD mod2 with a threaded barrel. I cant seem to find any holster that will fit the sights or the barrel both. Any suggestions?

Since there are no plans for a suppressor in the near future, I am considering getting a standard 4" barrel and new sights to fit a kydek holster. Any recommendations?
I just ordered a Tier 1 Axis Slim with suppressor sights, rmr cut, and compensator compatible. Almost overwhelming with all the choices.