I'm glad you quoted from that conversation in "End of Days" - it's where I felt Buffy and Faith finally made their peace with each other.

Despite the fact Mayor Wilkins was the only figure Faith had ever known, she does give Buffy the knowledge she needs to figure out how to kill to Mayor, and Buffy forgives her.

Plus, with the forehead kissing! :-)