I would look towards the following compounds. I'm not sure which will react best with your body, but finding a good stack out of these would keep the water down (somewhat), and still give good strength and lbm.
Test Prop
Winny
Tren
Tbol
Deca
Obviously not all of these together. I'm also hesitant to suggest dosages because I don't know how your body reacts to these substances. I do very well at low doses, while others don't get anything from them.
Simple combinations like test and Tbol, or the test and winny would probably do great for you. I'd keep it simple at this point since your body is fairly new, and I don't think you'll have much trouble at all gaining that strength and mass.