Yeah man, there's only one whole tone. All I'm saying is phrase the scale from b7 or 9 instead of root to root, sounds better.
Ex: C7#5
Play Bb C D E Gb Ab Bb C D...sounds better then then starting and stopping on the root. Also, throwing chromatics into the whole tone scale also makes it sound better
Bb C D E F Gb Ab Bb C D or
Bb C D E Gb G Ab Bb C D