Personally, that's what I would do also. I didn't mention upgrading from an S model as if you were to skip an iteration (generally considered most cost effective vs feature gain on iPhones), you'd get stuck with S models continuously.
This way, you get yourself out of that 'loop', and you get...