Cool, I'm glad your friend is a "keeper".
As for cloth diapers, I guess I 'cheated' I always brought a few along for 'showing off' but also usually did use disposables unless it was a car trip. Get a good wetbag and double it up with a garbage bag if you are bringing the dipes so you can just put everything in the wetbag/garbage bag and repack it w/o it worrying about getting to the rest of your suitcase.
Really, you'll know what you feel like at the time, but packing, imo, with babies is a nightmare, I'm horrible at it for myself and the amount of stuff I brought for Josh was incredible. Thank goodness I won't have 2 in diapers at the same time, lol.
Usually most of it doesn't get used, and I always forgot something that I needed. But it all works out!
Jessica.. Falling in love all over again..... Dh, Joshua Rebeccaand . for Laura