Are you still on standard air suspension? If so don't go for longer shocks as this allows the axles to droop too far and risks damaging a height sensor. Bilstein are the go to.
Earlier cars came fitted with the 16x8 ET57, later cars were mainly offered with the 18x8 but the 16's were still an option.I run 16's for a bigger sidewall.