DO NOT GO BACK! You obviously know exactly whats going on and I would tend to agree on all reasons...the only question is what are you going to do to fix it? Analogs are not an answer and it sounds like you truly dont want to go back...so simply dont. It is a choice. For now, jack up your nic level some until you can get a BMF in hand and get smoothed out again. I have days where I jump up a nic level for a few hits here and there, but honestly once I quit screwing around and went back to my BMFs exclusively things leveled out fast and I just plain enjoy vaping it. True nic cravings are rare and I smoked for almost 25 years!! I also find my Atomic FB hits hard and satisfies for when those crave moments do come.
When are you ordering? Don't procrastinate...sounds like you need it asap.
Unfortunately it will be at least a few weeks.