No matter what plan you follow, I'd give it at least 4 weeks before making too many changes. I'd pay attention to how you respond...you may want to increase calories slightly, given the amount of training you're doing. Better to start higher and have room to move imho.