Slojak,
Have you considered piping the water heaters in series, putting the old one first to use as a tempering tank (don't even turn the electricity on), which could help reduce the heating load on the tankless, then if the tankless fails to heat, just turn on the breaker to the old one so...