Sounds like the boiler is only switching off because it’s hot,so pump stays running,is it not wired so the valve heads switch boiler on,off rather that the valves just opening .
Heating part of the system would definitely benefit from 22 mm flow and return fit the main part of the system of till it possibly split into different runs.
35 kw boiler will give around 14 litres per minute at @ 35 degrees rise so if your incoming supply is good enough I think it will be fine...
As previous post have you240 v on the grey when you have a call for heat .? If not are you getting 240 on common on stat then 240 out when it’s asking for heat