I have to admit that I was really really hoping that, during that sequence in the ARC, we were going to have a Lester/Monty vs. Dave re-match. Not sure whether that would have actually solved any of the problems you mention, but it seemed to me like the obvious way to go, and would have been a nice little piece of fan-service... :)