Though they are hard to come by, they did make short wheelbase cars with the updated interior. I'd hold out for that.

-Jason

__________________
1991 350SDL. 230,000 miles (new motor @ 150,000). Blown head gasket

Tesla Model 3. 205,000 miles. Been to 48 states!
Past: A fleet of VW TDIs.... including a V10,a Dieselgate Passat, and 2 ECOdiesels.
2014 Cadillac ELR
2013 Fiat 500E.