For the next 5 years, I'd wait until the 32GB option appears. It'll probably be a very minor manufacturing process change that'll most likely come with slightly better processors. If the current support for the previous-gen model is any indication, the new ones will be supported for a very long time - the previous-gen 13-inch was sold from 2008 up until this week.