I didn't make my original post clear - apologies. We are on separate tickets and also changing airline in Doha. Thanks for the advice so far!!