If you have the floor space, I think that a hybrid water heater [that has a small tank to provide instant hot water and then switches to direct (tankless) heating] offers very good performance and efficiency at similar cost to the tankless models. I was looking at a AO Smith Vertex
http://www.hotwater.com/vertex/