That description rings a bell. I can't remember title or author (naturally) but if I'm thinking of the same story, it's after Buffy is resurrected and is so depressed and unhappy. Willow decides to 'help' her by cheering her up and bespells her to be all like the happy perky Buffy they met in S1 and of course the spell goes wrong...
I wouldn't mind reading that one again myself, if anybody remembers the title...
I also remember the switching bodies fic you mentioned, but of course I can't remember what that one was called either....
Sorry, I don't appear to have been much help...
