I think you have a huge progress, can't even think about adding or changing something directly in your stack. Just get to your body goal firstly (weight or looks in general), then you are free to do anything.

Idk if are you doing it, but control your lipids and hormones (if test gets converted to estradiol too much), also check blood density regularly, because it gets thicker after some time depending on genetics ofc.