Im in a similar dilemma. It is a good dilemma at least. I bought a Motofab 2.5 kit with a rear block included after a few beers for my 2018 on Amazon and it is sitting in the box. Then I traded to a brand new XLT and bought the Rough Country 2” made for the 21 with the extra cam bolts. Motofab...