This is indeed a common complaint.
4-AD will bring relief for many. If you do not wish to add an aromatizing substance, E/C can be used to counter the effects to some degree. I would not worry about Ephedra hampering gains; the literature would suggest that, even if in positive calorie balance, E/C exerts a slight positive partitioning effect in favor of lean mass.