Test-P is the way to go as far as I'm concerned. I recently ran a Test-E cycle and I was not a fan. I did gain on it, but I just felt blah on the cycle; I also broke out like a mother****er.
I am not cruising on my TRT dose, and I will blast with Test-Prop. I feel much better on it than Test-E.