I've successfully transferred my thinking to a "2 carry-on luggage policy" (thanks to simongr's previous thread).
I now use a roll-on deodorant for my trips away and have enough of the small toothpastes and small shaving foams from previous international trip amenity packs to last me months of travelling. The shaving foam is Gillette I think - I haven't paid that much attention to the name on the can. Alternatively, I take the small tubes of shaving cream (but I hate the stuff).
I use the same shoes, suit and pants for the entire trip (as I'm not seeing the same people on following days), with change of jocks, socks, shirts, ties and singlets in my FF bag.
I now find that my flexibility is better (I can change flights at a moments notice even after check-in) and I simply check-in at QC - the queues at the Service Desk have yet to be larger than the queues downstairs. I am always amongst the first to get to the taxi queue or train (BNE, SYD) as I barely break stride going through the Terminal.
I've used this for trips to SYD, CBR & MEL so far this year (longest trip has been 3 days) - will be interesting to see how it also goes with upcoming trip to PER & BME (also 3 days in length).
The only downside is that my carry-on is slightly heavier, but I apportion my clothes and client files between my FF bag and laptop, so neither would be over the 7kg limit.
I'm lucky that I don't have any international trips in the foreseeable future (well, only AKL in Oct/Nov) but it's only a weekend.