I just got a call to say my visa extension has been granted and I can stay in the UK for at least another 5 years - possibly indefinitely if I spend (more) vast amounts of money to apply for that next year!
I feel like I've been in limbo for the last few months waiting for this to work itself out, so now I'm feeling pretty good!
And I get my passport back, so bring on the holiday!