One trap with changing from a storage unit to a instantaneous unit is that the gas supply line may have to be upgraded from the meter.
This is because the inst.unit can burn more than 4 times the volume of gas when heating, may be big bucks.
Get a plumber to check the sizing of the line...