...and I don't trust myself not to lose my resolve on a night out and to start socially smoking again.
I think that's the important bit right there. If you feel that, it'd be better to be prepared. Even though you say you've not had a problem with cravings and such, they can sneak up on you. I started out smoking socially too. For some time actually. At some point I can't pin down, it turned into being "hooked".
I'd say try the 0 nic and see if that does it for you with the "ritual" and social aspects. If you can avoid the nicotine entirely, that's great. And since you say you've not had cravings, you probably can go without the nicotine.
Ideally, you don't do either. Though everybody here is pretty sure vaping is much safer than smoking (well, what isn't?), we don't really know what the long term effects of doing this stuff are. It's too new. There may be some questionable effects over the long haul. Won't know until we get there.
But we
know what smoking does right? So I'd rather see you vape than smoke certainly...