I might suggest Osmanthus fragrans. The newer leaves on Osmanthus have smooth edges, while the older ones have a bit of serration. Mine just finished blooming here in California.
I don't believe Night blooming Jasmine is hardy in Zone 7, and the flowers have a longer "tube".
