If buying wheels, go with a size that allows lots of tire options. Stock sizes are getting limited. 17" is the way to go, as it allows lots of suspension and tire options, while balancing between firmness and ride.
You can then do the lateral link upgrade.