Dave,
Whirlpool has had some serious problems with one-shot safety systems overreacting on their water heaters the last few years.
GE builds several 40Gal units with 48,000BTU or so. This puts your recovery below one hour.
We've done two GEs in the last two years, both were easy to install and the inspector (required in Fort Collins) was OK with them.
A few things to note:
You absolutely must by a new flexible gas line to the WH.
Follow the instructions on what to pipe dope and what NOT to pipe dope exactly.
Don't believe a word about how great teflon tape is, use proper pipe dope which is certified for gas and water.
Stands to raise the heater are cheap, if the height would cause problems with the current vent, just buy the fatter GE, it is smaller and that usually solves the stand + WH height problem.
Be sure the overpressure valve works and is attached to a tube which ends at least 6" above the floor (there should be one attached to the new WH, if not, don't reuse the old one).
The vent cap which comes with the new WH should be used, not the old one, they are designed to ensure the right draft for each unit.
Check for gas leaks, check for draft, then fill with water before turning on the WH.
Give it a good hour before you wonder why there's no hot water, it takes quiet a while.
Hope this helps.