MarnaLou, what a great problem to have!
The pre- and post-cruise luggage dilemma is one that I try to deal with by planning some place to store the large suitcases full of cruisewear, clean or dirty! The luggage storage at Faa'a sounds like the perfect solution. Since I like to use cruises as "punctuation" to land trips, creativity is required, for sure, such as finding a hotel that will store luggage for you between stays, airport storage, etc. This has worked well in the past, we'll see how well I can arrange things next year on WAVE, where we intend to dump or luggage at Heathrow after the cruise, prior to our land trip.