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

@colinwalker The tariffs are too expensive for me. I’ll be sticking with my 7 for a while.