I'm sure you have all the solutions at hand now. I am curious to know what you report back after taking your next flight. Maybe, to take one for the team, you can try one method going and one method coming back and tell us how it worked for you. That would be very helpful. ^
Till