I'd say just go with your heart and buy the Ranger. Sounds like your mind has been made up and there's no sense agonizing over it.
FWIW, I have a later 2016 built P5, and with the very few improvements ie. seat heat kit, the 2017 under dash air diverter and dealer installed head pipe insulation...heat is no longer an issue for US, and the way we use the machine.
Everyone has different needs, but our 2016 P51k fits OUR needs just fine. Would we purchase one again? Absolutely!
I have the comfort kit upgrade. tell me more about the divertor and head pipe. My Gf has a medical condition that is worsened by heat. I would be fine like it is but we havent been trail riding since this came about so any help would be good for her.