Ok. Yup, Cmaj7 would keep it in minor, and slapping a b5 on the F# would do the same. Then you just have the change to harmonic for the B7. Not bad. It sounds kinda latin.