test prop coz it will be more hard look and less side-effects, I mean in case i notice smth i just stop injecting and it is out of the body quick.
Regarding dbol you are right I will either replace it with turan or anavar.