Couldn't you have simply changed seats? The odour issue isn't any worse than cigarettes (it's arguably much more pleasant smell).

Re:Toronto, there have been literally a million casual users here for years (as there are in any major city). I don't expect a major shift in behaviour. If anything, easier access to edibles and vaporizers will likely reduce the frequency of smelling it.