I think Yojimbo's a better film.
That said, its awesome looking at the way Leone adapted it, to the smallest detail. Like changing the Toothpick to the Cigar!
That's Leone for you. Apdapting things to the smallest detail as you said Gentleman! I honestly hate the comparison's of these two films because they're really not that similar. Yes Leone borrowed the plot, but he changed things drastically different. It's not really a remake pursay. Christopher Frayling explains this on the Fistful SE DVD. I think he's right.
Anyway, welcome to the forum Gentlemen!