@cascadewheeler I spoke to a girl (forgot to get her name) on the Support line yesterday, and she stated that A). + will not be upgradeable to XR's, the XR battery size is several mm thicker and will not fit in the + frame (I had hoped that those black plates on the bottom of the XR, meant that XR frame was the same size as the +, and those were just the new battery/power covers, but according to her they are just rail protection), and B.) that there were no plans that she was aware of to help out anyone who got the + recently but would have preferred to get the XR (I got my + August 9 2017, so exactly 5 months too soon - I would have paid the extra for more range.)
It'd be nice if FM offered prior OW customers a discount on newer models to encourage upgrades and smooth these kinds of ruffled feathers. Even something like $50 or $75 or $100 off, even if mostly symbolic, would feel like at least a customer loyalty acknowledgement.