Yeah, I can't think of anything better to go with test than fina (trenbolone). Man, those 2 together are unbeatable!
If you can only get the 2 you mentioned, or don't want to try fina (for some unknown reason, lol), go with test/deca and bridge with a low dose of primo while your hpta recovers.