You might be interested in knowing about this smith. Check my webpage at:
http://www.geocities.com/alchemyst/kanezane.htm
Since this is a gunto (WW II military), I wouldn't be surprised if finding a
habaki would be fairly easy as the blades had to be within military specs.
Might try David MacDonald at:
http://www.montanairon.com/swords.html
Rich S