....

Nice vibe.
You did not feel comfortable at the change, try just practicing a few bars before the change, so that you feel comfortable with it. It may just be the timing? - tapping your foot in time or even moving your body in time would help you.
So where are you going to take it? Vox would be nice?