Wrangler guidelines are to indicate the long vowels, for the most part, so I made the canonicals your way. The possible exceptions are if there's a conventional English rendering (eg Tokyo) or if the fandom has a clear consensus otherwise (which is one of the places where I'm too hermitish to be an ideal wrangler; I'd be the last person to know about that... -_-;).