Just gave it a try, and I like it a bit better now! There's no longer so much of a disconnect between click and attack, which feels really satisfying. And though the Fireball range can still be a little inconsistent, at least it no longer stops directly in front of you, making it a great utility for clearing distant hordes while the Thunder Strikes prioritize close-range.
All in all, I think you nailed it with this revision.