Thank you for your feedback!
I agree with you on the double randomization being a bit frustrating every now and then, but I tried many iterations of RNG and didn't find one that fit this theme but also made it less frustrating.
One thing that might work is randomizing either movement or weapon after every turn, but never both. (This would be chosen randomly again xD)