Sounds like you had the right idea with your first cycle and I'm sure with 12 more years of insight about your body, you'll do much better. I would stick with a long acting test for this run and if you want to add some clen to help with fat loss, that will help. T3 can be pretty intense and unless you have the expertise to get yourself to low single digit body fat, it may do more harm than is worth. If you are looking to cut and build your clen up over your 12 wk diet, along with the right eating plan and cardio, you can get in pretty good shape. Add in a little DHT at the end, like winstrol or anavar and you'll harden up more. Plus you will want to use a little AI to control estrgeon and keep you drier. Here is what I would suggest
Test E 375-500mg EW
adex .5mg 2x Wk to EOD as needed
Clen starting at 40mcg, then increasing by 20mcg every 2 wks, going no higher than 120mcg.
Winstrol or Anavar 50mg ED
When your cycle is over, return to your HRT dosing a wk or so after your last injection.
Also, for your HRT, if the cream is working, more power to you, but I think that stuff is a pain. Its heavily marketed by the drug industry because they can make a lot of money off of it. In turn, MDs are pushed by the reps to write scrips for gel instead of test cyp injections. They can't make money off cyp! But IMO, it's easier to use and a lot less of a pain in the butt.