There will be security firms that specialized in handling bitcoin security, or education to increase the user's awareness of security risk
I think wallets will become more secure over time too. Both hardware wallets and desktop and online ones. I think maybe biometrics with 2-factor such as mobile phone will prevent scammers from stealing funds but as with any payment system there will likely be weak links.