Just no to both of them.
Reason: Game balance, not logic or realism.
RAW makes archery a reasonable way of fighting, NOT overpowered. Your change kills archers as PCs
Makes combat even more static as is. You can move double your move, nothing more, only the 1st square is ignored for movement...