I just noticed this thread!
I think the SNES pad is a good way to go. Genesis sounds good at first but six button Genesis pads aren't as easy to find as the three button ones, and a lot of the three button ones have awfully worn out d-pads. SNES pads are significantly more durable, from my experience. Of course, the button config doesn't line up well for Street Fighter II, but...oh well.