State water heaters work well for me. They build heaters for many other brands too.
Most plumbing shops have a line of old water heaters waiting to be hauled to a salvge yard. The tanks are rusted through, but gas valves are usually still good. If you bring along your old valve number they probably have a replacement.