Hi John - Is the cold water aerating as soon as the pump switches on, or after it has been running a while?
If I understand you correctly, the small tank supplies cold water only for the shower. Yes?
You could increase the cold supply from the tank to the pump to 22mm. What could be happening...