In event 2 you set player angle to (mouse.x, mouse.y)
You need to do this only when playing with mouse. So you can add a variable ControlType and check if ControlType="mouse", then set player to mouse position. If ControlType="gamepad", set player angle to player.8Directions.MovingAngle or something similar.
Also you should consider making separate event groups for different control types. Then activate/deactivate these groups depending on which control type is used. This will make the code more manageable and easier.