Your analysis of the problem is spot on, but there is another solution.Cure for this is simple,down rate boiler so it matches your pump performance(you cant you need 36KW),increase pump speed(you cant its on full),increase pump size.
The cause of the problem is the very high loss through the boiler's heat exchanger, 4.05 metres, which does not leave much available for the heating circuit if a 5.5 metre pump is installed. Assuming a total head of, say 6 metres, the Grundfos recommendation is a Magna 25-60, which costs about £450, plus installation say £600.
The alternative is to separate the boiler from the heating circuit using a low loss header. The existing pump would be suitable for the primary feed from boiler to header and a much smaller pump e.g an Alpha 2 could be used for the secondary from header to radiators etc. Whether it would be a cheaper solution is another matter.