ETA: And how are y'all getting 1,2, or 3 on an upbeat? They're downbeats. Or am I reading wrong?
As for the other, and assuming my previous analysis is at all relevant, the names don't matter: so long as your feet are moving in a continuous loop of Walk ball Change Walk, it absolutely doesn't matter if you say to yourself "1 &2 3" or "3 &1 2" or "2 &3 1". The counts are still falling on the attack of the beat, so they are all going to be on time.
What matters, though not enough to worry over, is that the flourishes match with the music, which means arranging that the part of the pattern where the flourish happens hits an odd count in the music.