MrMozez, vape juice bans are starting to show up all over. If you haven't already, look at mixing your own juice. There are DIY threads all over ECF and it's the way to ensure your right to vape as long as you have 100mg nicotine base in the freezer to mix your own juices. I don't see DIY flavors of any kind going away. They don't contain nicotine.
Calculate your daily usage and project it out to a lifetime stash of nic and freeze the nic. At 0 degrees it will last indefinitely. Store it in glass bottles (Boston Rounds are good) that are freezer rated, wrap them in bubble wrap or Kraft paper to prevent breakage, put them in a zip lock, and you will always have nic for DIY.