the fighting being sloppy is partially poor choreography and partially a result of the character. she's hasn't been developed to be some trained martial artist.
season 2 was worse than season 1 but was still compelling enough to get through, imo.
i dno why you thought ritter was miscast tho, i think she's been perfect