For extensive de-soldering stuff, if you can swing a desoldering iron I'd get one. I have a Hakko 808 that just rocks, and I'm told the replacement for the 808 is even better. They are absolute magic on circuit boards, and it makes for cleaner work on point to point stuff too. No blobs of solder to get out of the way, etc.