The O2 website is now quoting home delivery in "up to 3 weeks" so, hopefully, my previous-order shouldn't be too long.

@stefp I’m getting some offset by trading in my 6S plus so it’s not too bad.