I've always been curious if there was a samurai variant that resolves these issues. Anyone know of one?
At the risk of sounding flippant, Warblade and/or Swordsage.
More to the point, what is a "samurai" anyway? In both history and fiction they're too diverse to be represented with a single class and a single type of build.