I think the best way to integrate the Kristy Swanson movie (if at all) is to consider it the kind of film some hack from the Buffyverse would make out of her 'story': "Nobody knows who The Master is. Didn't Buffy fight Dracula once? Let's work him in instead."
Depending on how far you're taking the continuity, "Ted" is not an entirely expendable episode since that's where the Buffybot technology comes from.
I think the second half of Season 7 could easily be cut down to two hours or so.