OK Dave,
so you don't crazy red-headed shojo [a red haired, mythical creature in Japan who likes to drink sake - --- and lots of it!!] as companion on trip. very wise decision on your part!
i have not yet been able to afford a polish yet, but from feed back from NMB members, and from a sayashi friend of mine, Mike Virgadamo [some members might know of him] i have heard Robert Benson as being THE premire polisher in the US. unfortunately, he, like any other good sword polisher in the US of A, probably has a 1 or two year waiting list.
check out the Links page and the top of this page, go to restoration. there are several polishers listed; all good i'm sure. some, like Fred Loman, also sell swords, offer sayashi services, etc. look and compare. and wait for a senior member to give you better direction. they have had polishes done to their swords, so can give you an opinion based on real experience.
do we at least get a postcard from Japan?
doug e