First, unless you measured your BF via a reliable and accurate technique (eg, immersion; DEXA scan), I recommend you dispense with the BMR derived from the 12% estimate, and instead calculate your BMR based simply on your weight. BW x 15 is a good estimate for caloric needs on workout days; for you, this is ~2500. On rest days, BW x 12 (~2000) is your BMR.
So, as for setting up the macros: As you look around TN you'll find all sorts of approaches. CT's is fine (although I seem to recall him expressing dissatisfaction of late with that particular article). My personal preference is to countercycle fats and (to a lesser extent) protein along with the carbs--in other words, let fats go low when carbs go high, and vice versa. Something like:
High-carb day: Protein @1g/lb BW (or a little lower); Carbs @2.5g/lb (or a little higher); Fat @ incidental only. (This day's caloric total should run about at BMR (ie, ~2500). This will help keep leptin from crashing.)
Medium-carb day: Protein @1g/lb (or a little higher); Carbs @1g/lb; Fat @ .5g/lb
Low-carb day: Protein @1.5 g/lb (or a little higher); Carbs @.5g/lb; Fat @ .5g/lb
No-carb day: Protein @1 g/lb (or a little higher); Carbs @ incidental only; Fat ~100g. (It's important to have some high-fat days, as this helps supports hormone production.)
You would run 1 High, 2 Med and 2 Low days on your w/o days, and No-carb on the 2 rest days. Note that there is some built-in flexibility to allow you to tailor how much of a caloric deficit you want to run.
Carbs should be distributed centrifugally, centered on the peri-workout period. That is, the carbs on your low-carb days should be consumed in the peri-workout window; on medium days, in the peri-workout window + the immediately preceding and/or following meals; etc.
Because carbs promote AA uptake, protein intake need not be quite as high on the High-Carb day. (To paraphrase Shelby Starnes, carbs make protein more 'available,' therefore, a plenitude of carbs means less dietary protein is required.)
OK, that's a lot to think about. Looking forward to your (and others') comments.
(Edited for a math error, and for clarity)