You should be able to adjust your shifter to provide more room. I also find myself using the side of the boot, the stitching along the sole, to upshift instead of putting my entire toe under the ****er (even though it does fit.)
My SD and SJ are size 9FF. I got my CXL Nomads in size 9F. Going down one width is good advice. Mine measure 16.5" inches around the top. I put the tape measure around the outside while wearing them. My jeans have an 18" cuff opening and work fine.
My Stockman is about 5 years old. But it doesn't get a ton of wear. I just own too many jackets. I've lost some weight and the fit is a bit loose but the shoulders still fit properly. It fits nicely over a thick wool sweater.