First cycle 500mg test enth was a good choice.
For your second, if you want to raise the bar a little, so to speak, try:
Test e 500 or 750 mg per week for 14 weeks
Deca 400mg per week (end 1 week before test ends)
d-bol 30 - 60 mg per day OR Anadrol 50 - 75 mg per day for first 6 weeks.
This way, you can still pin only twice per week (mix 250 test with 200 deca)
PCT as always...