If you want to keep it short then test p would probably be your better option otherwise as has already been said 10-12 of test e alone will be sufficient.

Remaining lean as you are wanting is all about diet yes some gear will bloat you a bit more than others but that can be controlled again with diet and also ai