We've played this bit the same way for about a year. I had gotten used to trusting the length and the chords.
Then one evening during band practice the bass player wants to experiment and change the length and the chords.
The 2 things that kept my solo together vanished in one instant.
Back to figuring it out all over again.