So, I know you posted this a while ago! Sorry, I'm just seeing it, although I wouldn't be able to give you the same advice at that time!
I'm not sure if you found a new tank, but I just got the eVic Primo Mini with the ProCore Aries tank and I LOVE it! I had the same problem, my BBB tanks leak like CRAZY!!! I'm not sure why, but I've tried EVERYTHING to stop it and it just isn't working. The ProCore Aries tanks have yet to leak on me and if you like the coils from the BBB, they work in the ProC tank, although I'm going to trying the ProC coils bc my M2 (BBB) coils haven't been performing so well lately!