Thanks for the reply. Looks like you were the only one brave enough to put a suggestion forward on this one! You understood my note correctly, yes the cold water tank only supplies the shower, nothing else.
The aeration happens almost immediately so I'm tempted to change the pipes to 22mm...