test-e is fine. short ester gear is good when you want to test the waters on a new compound you haven't tried, especially something like deca or tren. other than that, long ester makes more sense.
the only difference between short and long ester is the weight of the ester, and how long it takes your body to release the hormone from it. it doesn't affect things like bloat, gains, nothing. you reach high peak levels, so THAT could affect it, but that is about it.
bloating comes from not eating and drinking properly primarily. if those are TRULY in check, you shouldn't have to worry about bloating.
what is your bodyfat percentage at? what is your training like? how is your diet?