Frankly, since they already diversify Leader Cards form Hero Cards, they could at least prevent Leader Cards form giving Magic Attack bonus.
Other than that I believe the game of chance played with Hero Cards is just part of the game you need to try and enjoy.
The greater the risk, the greater the satisfaction you get anything good, that train of thought.