Thank you all for your advice - sounds like I'll stick with the current booking and trust that the weather gods will give me a gentle tail wind for the leg into Christchurch. I chose seats in row 4 (they seem to have an extra inch of legroom and at 6'6" every little helps) so should be able to get a good view as well.

Fingers crossed that it all goes smoothly!