Just a bit bigger than CPL20? any suggestions?

Hi all, I recently came back from a trip overseas and I pack quite minimally, my main bag was the PLC20. Everything was perfect except for 2 things I realised during my trip.
(1) I would really love a seperate laptop compartment (taking it in out was a pain through customs)
(2) I wish the PLC was a bit bigger! everything fit perfectly for my needs, but when it came time to (e.g put my jacket inside or buy a gift for a friend) it was tough, since my bag was so full, I really struggled.

Does anyone have any experience with the CPL16??? I know EG says 16L but I've read some post where EG bags fit more than they say. (for example, the PLC20 fits way more than 20L in my opinion)

Thanks everyone.