It is good to see that you are seeing results with this protocol. In the end, the best solution for you is what you will consistently believe in and follow while still acquiring results.
That being said, CBL gives you all the benefits of IF without the cannibalism of your hard earned muscle tissue (especially fast twitch fibers, which go first - look into Kiefer's stuff on IF on his website). So the 'fast' from 7PM to 7AM the next day is not a long fast and will not give you the negative effects of fasting for 12+ hours.
Now, what I say here is from my experience with CBL and the info I have gathered from Kiefer's articles, forums, podcasts, etc.... Get rid of the BCAA's in the morning at work. They have the potential to raise insulin, which is a NO on CBL (by the way, Leucine is the only one of those BCAA's worth investing money in). The rest of the morning/early afternoon looks good, maybe try more animal fatslike eggs, butter, or cheese if possible.
Pre-workout: NOTHING, or caffeine or coconut oil if you can somehow get your hands on either of those.
If you want to back-load, then back-load. Kiefer also has plenty of info regarding pre-workout carbs (I'll give you a hint, DON'T have them! Too many performance and body comp benefits!) If you are afraid of not having some workout nutrition, start sipping the mixture about 15 minutes into your strength workout (not including warm-up). I would advise you to wait until post-workout, however, as this is where the magic happens.
Again, whatever you can sustain and gives you results will work best for you. These are just my recommendations from one back-loader to another. Hope this helps.