Re: Longer term
I've got a similar habit/history to you, and completely agree with the desired trajectory i.e. stopping the vaping too.
Re non-smokers taking up vaping, could it be a hipster/fashion thing, where they're just on non-nicotine liquids? Again this is just one bloke's observations, but I see a lot of young guys with beards, top-knots, wearing no socks blowing enough "smoke" to make me wonder whether to call the fire brigade.