You will not like this answer but its good advice...

You do not need to stack anything. Keep doing Test only cycles and focus on your food. You do not weigh a lot for your height so I assume food is a main concern. Food choices also influence the water weight you experience.

Overall, find foods that work well with your body and you will find that you can gain lean mass on Test only.

I like NPP. I can put on Mass and still remain pretty lean and dry. Its really up to your diet though. Growth will help keep the fat off. Allot of guys seek different AAS's for gains but just remember that 90% of your gains are made in the kitchen. If you want to stay away from MPB then DHT's you wouldnt want to use.

Possibly try some npp

Injectables don’t help combat water weight from test, unless you’re using masteron at sub 10% bf, meal plan certainly dictates that. Also, Depending on your Bf at the beginning of the cycle would determine if you’re prone to water weight. When I’ve started at low bf 10% or lower, most of the gains that came were dry if diet was in check.

If you’ve hit your physical limit in terms of training and maximizing your gains naturally through calories then I would consider Primo or Eq. I’ve used primo with a low dose of test over the course of 20 weeks which yielded 10 or 11 pounds of lean muscle which I kept most after pct. Yes, expensive compound but well worth it considering virtually no sides and a beautiful soft landing recovery. Test was kept around 300 mgs, primo 500 (Bayer).

Eq and bold Cyp are other ones to consider. Eq gains are very slow and pure quality. I made the mistake of running 1gram a week while running low test and ended up crashing my estro while not running an AI. Eq is a little tricky because it doesn’t present some sides like anxiety, head aches and of course with increased red cell production, you’ll want to either run blood work multiple times or donate blood. Rusty has excellent forum posts on most compounds.

Also, just a reminder Some of my best cycles were test only cycles with either Anavar or proviron. Prop is an option in terms of cutting but again that’s after you’ve made the most of your opportunities through natural bulks. If you’re not a fan of a multiple pinning week protocol then just stick with the long esters. Anavar and proviron aren’t as toxic as other orals which Present harsh sides. I’ve always ran test at a lower dose (350 mg max) while letting other compounds do the work or at that dose, just used it as a booster for easy recovery. Everything depends on Experience, goals and personal preference.

Guys like Makwa, Rusty ifit and others have great forums on related topics.