Try to keep carbs in the prep phase as low as possible. 30g is the absolute ceiling. I know this is gonna sound blasphemous but is drop some of the starcher veggies like the onion.
Also, Kiefer typically recommends CBL for folks under 18-20% body fat. Have you looked in to carb nite?