I was in state machine hell for about two days... I was pulling out my hair and really not liking how my player's move mechanics was working.  Now I have what I think is a solid state mechanic for the player and a fun mechanic with the jumps: long jump and high jump.  The  long jump happens when you jump and you're moving while high jump happens when you're idle and you jump.

This idea might make for some fun encounters.