I have the medium iron (the -12) and I'd consider it perfect for what you want to do. The iron comes with a 1.6mm chisel tip (900M-T-1.6D) that's pretty much perfect for all around use. I'd bought a larger version of the stock tip (900M-T-3.2D) for big stuff and a smaller version (900M-T-0.8D) for SMD work. I've used the larger one on occasion and it's worked on everything up to and including soldering four 14 gauge wires together (don't ask). The smaller one's still in it's static bag as I've yet to need it for surface mount work, though I haven't worked with anything terribly small that wasn't solder masked.
The FX-888 is the natural successor to the 936, and appears to have a few interesting additions to an already excellent design. It appears to be available everywhere except the US, I'm not sure why. Dave's done a bit on one of the live shows where he shows one off, and he may do a review on it soon. Though Hakko says the tips and irons aren't interchangeable, Dave swapped the tips out without trouble, though if I recall correctly the new iron has an extra pin in it's connector.
It might be worth trying to get an FX-888, but I guess the big question is whether it'll ever be available in the US. I'm not sure why it isn't already, but finding out may be as simple as contacting them. As many of our friends from around the world here can tell you, it's no fun to have to source expendable parts from outside your country.
Either way, if you're looking for an authorized Hakko distributor in the US I'd recommend
All-Spec. They've got lower prices than HakkoUSA on just about everything, and they've got all the extra goodies like liquid flux, desoldering wick, and of course solder.
Hope that helps.
![Smiley :)](https://www.eevblog.com/forum/Smileys/default/smiley.gif)