What is the best type of water heater to use?

It is time for a new water heater and I don't know what to choose. Tank less, with a tank, gas or electric. I know that gas/propane would be the cheaper route but I'm looking for some opinions. In my house 2 adults live there. We use shower, dishwasher and washing machine. We do plan to get GeoThermal in the next few years. Also what do you think the best brand of water heater would be?