Series 7 and 8 must surely have happened, otherwise the picture on the grave would have been Clare Grogan, right?

Not necessarily - when an actor's been replaced it's normal to do flashbacks with the new actor even in a time when they shouldn't have turned up yet (http://tvtropes.org/pmwiki/pmwiki.php/Main/FlashbackWithTheOtherDarrin)