Hey bro, looks like you made a good choice for your first cycle. If you were to run the same cycle again, I am certain that you could make the same gains, or even better, as long as your understanding of nutrition has improved along the way. Like you said, that is going to be the key. If you don't have that nailed, any gains you make will be lost when you come off and lack the nutritional support required to carry the added muscle.
A good low side effect option would be EQ. It's a safer compound and the gains are of high quality. I would run it at 400mg EW on your first run, coupled with test, once again at 500mg EW and your adex, probably dosed at what worked before. I would run this cycle for 12-16 wks total followed by a solid PCT like you did before. If you want to help ensure recovery, you could run HCG through the cycle up to PCT starts at 250iu 2x wk
Another option would be to do test as you did before and this time, kick start the cycle with 30-40mg Dbol for the first 6 wks. This will produce some big mass gains quickly and it makes the cycle fun, quickly!