I'm in this boat...Galaxy S II or Droid 3
Droid 3 has the keyboard keys...i've gotten annoyed just today attempting to use the on screen on my Droid 1...i can do it in a pinch though. Also, while i've gotten used to the onscreen hiding what I see when in landscape mode, i don't like it.
Galaxy S II has the smoothness, the UI (I prefer TouchWiz for manufacturer enhanced builds of Android) and potentially the easier tinkerability (unencrypted bootloader)..and the screen. SuperAMOLED is impressive as it is, can't wait to see how plus looks.
Thing is....can i wait that long....i don't know with a semi busted headphone jack.