For the one year anniversary timing problem, if you count their first date as going to Senior Kevin's in the Dreamatorium episode last season then the timing may match up a little better.  I know they weren't officially dating then, but I think that may be what they were going for.