I'd bump the lap count back to what you were doing before as that seemed to be working for you. If you've got a beard like mine, 20/25 is not enough. I do 50/50 at a minimum. You might also try...