I will probably run a very similar if not the same run that you are planning on running Mark! And exactly 6 weeks, or 6.5 weeks at the most, since I would not be running hCG this time.
I also say up calories, Use much slow digestive sources and the fast digestive at their critical times, I believe that would aid a lot.