Test prop and tbol would be great, but I honestly don’t see much of a need to change to a shorting acting ester unless you had specific reasons. You could mess around with a lot of different compounds if you wanted, but asides from test and tbol you could also consider var, primo, eq, maybe deca...