I go here by habit based on earlier good experiences. Maybe not the cheapest but I trust them.
I’ll give a few miscellaneous comments;
A regular water heater is super easy and potentially much cheaper to replace than the new tank-less. Most anyone with a few wrenches and a spray bottle with soapy water for testing can replace a regular water heater…if it was set up well in the first place.
Does you current system have a recirculation pump?I have used that to accomplish on demand hot water before and while I didn’t do a comprehensive study, it was working well on economy and service. I suggest that when you compare total cost and long range efficiency of the two types of heaters, that you consider a timer operated recirculation pump on a regular tank . Hot water on demand still has to push out a bunch of cold water from the pipes depending on the plumbing layout.
The Tank-less probably needs higher available btu’s from the pipe than your old heater.Make sure you have it. The new installation is somewhat more technical and requires more materials. I would suggest a top-notch plumber or a least a technician who has installed lots of them.
You might want to study how the system that you will be getting soon would be more or less beneficial to the solar design you might choose if you might go that route someday.