OP, your $ estimates look pretty good. One more thing on the "Extras", there is a tiny/minor difference in the 7 GOAT modes, IIRC:
Badlands: RockCrawl, Mud, Sand, Slippery, Baja, Normal, and Eco
WildTrak: Sport, Mud, Sand, Slippery, Baja, Normal, and Eco