Im in the same situation but backwards....
My brother has a 3rd Gen and gave me his upgraded springs/ struts for the front and the springs and extended bump stops for the back. Not sure of the brand. My rig is 5th Gen, 2016... Not quite sure if there going to work... Have to pull the vehicle...
