I doubt I will upgrade next year though unless the changes are drastic
I think the expectation is that after a couple of years of small incremental changes, next year's 10th Anniversary iPhone will bring the biggest changes aesthetically, including a glass front and back.