Yep, you're fine til 2024, and hopefully things have calmed down a bit by then. I think some let you re-mortgage within 6 months of your current deal expiring if you can find a better (or less bad) rate.
I'm due to remortgage in July, currently paying 2400 a month. Safe to say, I'm not looking...