Seeking input from those more knowledgeable than myself…

I’m 40 years old and been in the gym regularly for well over a decade.
On TRT for 4+ yrs
Currently 6’, 195lbs, 13-15% bf (on the highest end)

1st cycle: test only (at 480mg/wk for 12wks)
2nd cycle: test (420mg/wk for 16wks) & anavar (started at 25mg up to 50mg/day for final 9wks)
Also, for more background info, when I used to go through a clinic they prescribed me some nandrolone and I didn’t feel great on that (but maybe that was too low of a test base and I had too high of bf% to feel great? Idk)

1st cycle was a bulk, ate at surplus during the colder months. After that I lowered back down to TRT dosages for a cpl months then started 2nd cycle. Had good results eating at a deficit and lost a lot of weight for a beach vacation. I looked pretty good and felt good, but now I’m feeling too small and wanting to add some mass.

Seeking suggestions:

Wanting to eat at a small surplus and put on some mass without putting on too much bf%. Any suggestions for compounds to add? I’d like to explore adding another injectable as I’ve never done that before, but I guess a higher test and oral only cycle could be an option. Also, I’d like to keep it at two compounds only so that I can differentiate between side effects since I’m still fairly new to the game. What would y'all suggest? (FWIW I plan on being on TRT for life)