Sounds good.

1. Don't taper the test, keep it at 500mg for your final 2 weeks.
2. Run your cyp up to week 15, as it takes 2 weeks to clear (from memory) and EQ takes 3.