I still think a single-payer system would be best for the economy overall. Decoupling healthcare coverage from employers should free up the market for people to switch jobs and take some risks that might otherwise be unthinkable. If the only thing keeping people working for a company is the healthcare, then maybe that company's practices actually have a negative net impact on the economy even though the balance sheets are in the black. Productivity, stress, and morale may actually be improved by a company with better work-life balance. It's worth considering the side-effects the structure of our society has beyond the highly visible numbers.
I don't see HSAs as an add-on to insurance (i.e., offers any kind of protection). I see them as a way of paying for meds, office visits, etc. with pretax dollars as long as you are healthy and continuing to work.
Also, you don't have to be good at investing to fully fund an HSA; the difference in cost between low- and high-deductable insurance is supposed to offset the cost of funding an HSA, and currently does do that.