If it was me I would start back simple. You are going to respond well since it has been a while since you ran anything. I am very conservative so if it was me:
1.test at a dose that does NOT require and AI/SERM to prevent gyno.
2. primo or mast
3. telmisartan: angiotensin receptor blocker: basically negate many of the negative potential effects on the cardiac system.
It's simple, relatively easy on lab markers(sane dositng assumed) and would provide a nice look for summer.