On guitar guy's version, try a Cmaj7 (2nd C in the chorus)before going to the C7.

That's the way I learned it from an old jazz guy years ago.

Russ