Hi,
Before and after as below
Using this I can see that the current 15mm was just about OK @4.1 kW, but presumably not for the current set up which needs 6 kW.
I've tried to indicate where the pipes are exposed (yellow) or red (buried in wall / floor).
The plumber is...