Mine is the same as the OP's. Though I use powder make up, which helps with the 3 11 bag. I use Muji clear zipped bag which has been okayed at every airport but Edinburgh, where an officious chap made me put all my liquids in the quart bag. Of course it all fit it went through the scanner and I put my stuff back in my bag and handed the chap the bag back.

Sometimes I take Lush solid shampoo, a good space saver.