Yeah, I think hardware wallets will be a big step in the right direction.  Desktops, laptops, tablets, and smartphones aren't designed to protect private keys.