This is where I bought myself a great katana when I was in Japan a few weeks ago. Just noticed the website address on my custom declaration for a weapon.
www.katanaya-asakusa.com
They have some pretty cool shit and are super nice people - they don't speak English very well but they tried...