My suggestion is to add a more obvious indicator of which access is selected. It takes a bit of moving to see that one is in the wrong direction. Perhaps making the selected axis line itself thicker.
And still I cannot force the Move tool to use the green axis, even with the arrow keys, but at least this would let me know that before I mess up my design too much.
Cheers