^^^ That. And you know you have to get that bodyfat down. Doesn't have to be 7% but between 12-15% would be good.
Once you got that down, I'd go with test again. It's been awhile since you've been in the gym. Good test cycle would be good. And, Test is the best for us anyway.
I'll be 50 next month, my man. I don't know what I'd do without test. Love the stuff!!
Get those bloods done and keep us posted.
Good luck on whatever you decide and have fun.