In overall consideration, if the priority is to leave it as is, don't change it. Instead, put it in the XML so players can make their own mind, just like most other things. This is what really gives players the most fun, after all.
In my "game", I would change attacking to cost 2 movement points. Most units never get above 5 movement, so move 2, attack (cost 2) then move one more is reasonable. Of course, attack, move, move, attack isn't reasonable. I will just have to take this one as it is and look for workarounds, maybe a spell that grants one extra "move action" or something.