As I said in my previous post, I don't mind if we have to check our luggage all the way through to AKL, we have bike boxes and it would be way easier to do that, than it would to have to collect them for our 26 hour layover in DOH.
This is not a multi-city booking.
We were meant to be in DOH for 2 hours, but the Tuesday flight to AKL was cancelled. The Wednesday flight from EDI arrives into DOH after the AKL flight leaves, so we had to keep the original Tuesday flight to DOH and take the Wednesday AKL flight, hence the 26 hour layover.
I have booked a hotel in the city so we can do little sightseeing.
If it's 100% confirmed the agent at EDI will check the bags to AKL, we'll take a cabin bag for 1 night in Doha and that'll make things so much easier for us.