I didn't redisplay the menu just so it didn't spam the screen, going for a lighter touch, but now I think spamming the screen with question re-iteration and choice list every time, is the lesser of evils.
The other change I made was changing the default prompt in TWO theme mode back to ">" so you could see you were in choice mode by the '?' instead.