ok one more tweak:

switch to test cyp at 600mg/wk
and EQ at 400mg/wk

600mg should be enough after 12 months off right?