Sooner or later, in your scenario, I would want to be keeping an entire spare BCG, so, would probably be ordering a BCM BCG sooner or later, anyway. No particular, hurry, but better to get it before some significant event prompts the whole free world to suddenly try to complete their AR15 uppers.
I used to just keep a whole spare bolt assembly, and still do, largely as a hedge against dropping parts in the dark, in some strange place, but, after learning/understanding more about potential failure points, decided to start keeping an entire spare BCG. At the moment, I am actually behind, in my goal, as I recently added two uppers, to be able to complete my lowers, and could only add one BCM BCG, as Primary Arms was only allowing one BCM BCG, per household. No worries, I will catch-up soon. (I am on Primary Arms’ e-mail list for LMT Enhanced BCGs to return to stock.)
Enjoy your new BCM upper!