I think you're underestimating the Tesla supercharger network. It basically solves both of those problems (if you have a Tesla) and live in the vicinity of one - if you don't live near one then it still solves the second issue.
The infrastructure is expanding rapidly, so your "unless" is a fairly safe bet.