I'm in the same situation. My plan is to get a 13 Mini, and hope that it also lasts me enough years for Apple to release another small-factor iPhone.