I'd add a bit more solder on all joints. The pins get a lot of punishment when fitting and removing connectors, and can also get a bit of stress on them just from the connectors being pushed, pulled, etc. I make sure the entire pad is covered smoothly, and the solder travels a reasonable way up the pin.
Definitely, cut the key pins rather than removing them. The plastic base can twist and move without them. Probably not a big deal though, maybe not worth trying to get them back in there at this point.
Fully agree with Chris re J9 - looks like factory, but isn't! Cleaning away traces of flux is time consuming and not really necessary, but gives such a professional looking result.