Thanks very much for your advice everyone! We're going in 2.5 weeks so I have plenty of time to pack and re-pack...and try and not think about it!