There are a lot of options. If you want to add some new lean muscle, maybe consider using EQ in the program. Side effects are lower tha test, so it allows you to push total Mg higher Without as much risk if test related sides.
Wirh your history, you could add in 400mg EQ and maybe extend the cycle a little and get a whole new experience. My outline would liik like this :
1-16
Long acting test 500mg EW
EQ 400mg EW
PCT starts 3 wks after last shots. 100mg clomid for 7 days., Then 50mg ED for 14 more daus, ==