I am having a hard time working this into the T4-verse, what with John being married with a kid on the way and all, but would you be alright with just Buffy/John in the movie verse? I'll keep Christian Bale as inspiration, but this way would allow me to skip the angst of off'ing his wife.