Shot acting test are better than the long ones to prevent water retention. But at some degree you will lose fat if diet is good. And don't forget some anti e.
In my oppinion the water retention will be lost when the cycle it's over. Proviron and nolva will help with the water retention. Your cardio may be affected by that through the cycle. Good luck.
I think you should drop another 3 %bf easy at your age if you are realy into the diet, and hopfuly add some 5 lb of muscle. But you'll have to up you protein intake to a 4-500g/d. and reduce the carbs to no more than 300g or even less. I recomand you synthepure whey protein as it is not mixed with any kind of carbs or sugars for taste.
You can cut now with your endogenous test, you can also cut with exogenous test. People become parrots with responses to these questions; the test itself won't make you lean, but you never said it would: But it will make the environment right for losing fat and maintaining/gaining muscle and I'm sure that is why you are considering/asking your question.