Ok, got the new boards ordered, expect them by Friday. Pictures of the new design are up and I've pushed it to Github. I decided to take the opportunity to fix my encoder issues with an external edge detector circuit.