OP, glad to hear they're taking care of you, sounded like their warranty department was about as competent as their machinists and assemblers for a while. At least one department there is doing something right.
My advice is to sell your BCL rifle when you get it back from warranty, there are way too many problems with their products to trust them with containing a 60000psi explosion 3 inches from your face.
Read back a few pages through this forum if you want to see for yourself, it's littered with negative reports all the way back to the release of the 102 and if you want to see the company's history just go to the black rifle section and watch for the NEA problem threads. This has been going on since they started making rifles for civilians.
One of these days someone is going to be mamed or killed when one of their rifles fails.