Welcome! Here are the website rules, as well as some tips for using this forum.
I would leave as is. I am in the middle of my own personal debate in regards to the actual efficiency of instantaneous type units. As I see it, every time you fire the unit up, even to wash your hands, the burners run at 100+ thousand BTU's. At the end of the day, i am not so sure that storage isn't more efficient. If you have a good 40 gallon tank that, lets say has a 1 degree per hour standby loss, your boiler will fire to reheat the tank every 40 hours ? How long will it run to heat the tank ? So that my friend, is my debate.