Looks like you are on track. You might want to consider just dropping the test enanthate 3-4 weeks out to avoid holding any excess water. Are you using hgh? If so, I'd drop the hgh 5 days out for the same reason.