What I would do is go standard apricus as I linked above, with electric booster- but setup the plumbing such that installing an instant gas unit would be easy. Then, if you find the solar doesn't cut it (unlikely IMO) then install the instant LPG booster.
instant lpg boost (4.7c/MJ) $8.36/hr...