So I've finally managed to get onto the app and we've not got confirmed flights, back to the original EDI-DOH-AKL but on a different day and with a tech stop in Brisbane.
The Qatar website is still showing the EDI-DOH-HKG-AKL routing, so who knows what's going to happen!