If it has been working okay for 10 years, why do you need to make it better? Are you not satisfied with how it is operating now? Why not just replace the old water heater?
As previously stated, dual purposing a tank for both the heating system and potable hot water supply is not recommended by many knowledgeable people.
If you want to learn about these systems the best book IMO is Modern Hydronic Heating by John Siegenthaler, P.E. Since your pipe is already encased in concrete, you cannot do much to improve/redesign your piping system. Do you have any info that defines the type of pipe, spacing, circuit lengths? If so, you could at least better understand the fluid dynamics and heat transfer capacity of your piping system. We have DIY analysis/design calculators on our website. Please carefully read the instructions before using the calculators.
Borst Calculators
Coincidentally, the illustrative pump performance curve in our hydraulic radiant floor heating design calculator is your Grundfos 15-42.