You know, a slightly tweaked and renamed CW "kensai" makes a fine samurai. He gets a close equivalent to an ancestral katana, a restrictive implementation of an oath of service, great social skills, an old-school, AD&D-style Strength boost, and even the chance to be a daimyo at 10th level.