There is no schedule for the next revision. There are TONS of other threads on this issue.
You say you are going to get one this summer so the best option would be don't worry about it and stress over it when the time comes. Cuz no one knows when these things are hitting the streets.
I'm in the SAME situation. You could always get one now and sell it later and pay for an 'upgrade'.