I much prefer dbol, which is a good mood elevator for me, as opposed to drol which can make me a bit grouchy. But that's just me.
Since you are doing test and tren, how about jumping with fina and prop? Taper down the doses in weeks 3 and 4, maybe, and stop it at the beginning of week 5? Just a thought. Something I would probably try, myself, with a test/tren cycle.