To my understanding, your absolutely right about waiting two weeks to start your pct. Due to test e staying in your system, it will override the effects of clomid(or w/e you use). That is why alot of people put a cutting type at the end of the cycle.
Ill be using epi for the last two weeks of the cycle, while injecting, and for two weeks afterwords. Total of 4 weeks. Then immediatly starting pct. If I'm wrong someone please say so, but I do alot of reading, so I'm pretty sure I'm right on the money here.
Good luck with the cycle man.