Contrary to popular wisdom, you shouldn't really do any future planning for electronics.
Unless your use case requires 32GB on Mac OS today, Rather than paying 40% extra today, sell your existing unit at a 40% loss 2-3 years from now (if at all you feel it's falling short - which it may or may...