My advice is to just do carry-ons if you possibly can. This might be a good time to learn the art of packing light. It can be done with more than you think. Look at some of the great youtube videos out there with tips. Makes this sort of trip less worrisome indeed.