So I've already sort of made my case to Japheth about emote targets that switch to first person, but if nothing else, is there a way to massage emote grammar so we don't see things like "You waves" that make the grammarian in me cringe? If nothing else, having something like, "You emote: [Your now lovely and correct emote with your sdesc]"

The inbuilt grammar system should be taking care of that sort of stuff, I didn't realise that was what you were getting at when we had our earlier discussion. If you see anything like that as an echo, post it in here and I'll fix it up.