Oomph... this is a nice new Vaillant condensing boiler!
Your rules of thumb are a little different from what I have gathered by inspecting many existing installations.
I have always found that 22 mm was normally seen as adequate for non condensing of at least 24 kW and that 28mm was only used on 28 kW and above.
Tony
Maybe in your neck of the woods Agile but not mine