Oh dear, corrosion in the heat exchanger, which sounds like a very bad hair day and the buffer tank idea is bleeding to death.
So it comes down to is this, what is the best way to have the boiler connected to the UFH system so that the boiler is running at its optimum heat output and yet...