You're presumably not still working on this, but see Giunti & Kim's Fundamentals of Neutrino Physics & Astrophysics, section 6.2.5. The key is that after writing the Hamiltonian as chi^dagger partial_0 chi, the partial_0 acts both to the left and to the right (which is often skipped over in...