My present top two choices are a 25-gallon 155-FHR from Bradford White vs a
40-gallon 50,000 BTU/H from Lochinvar.

The Bradford White is my favorite so far, but the Lochinvar is what seems
to be available locally.