It sounds like you are making progress. If the tranny is shifting at the correct rpms, but still shifting too hard, the problem may be the modulator (or you may still have a small leak someplace). Before you replace the modulator, you should try to adjust it. Do a search in this forum, and you should find lots of info on adjusting (and replacing) the modulator. You also want to make sure the vacuum line to the modulator isn't clogged.

If you want to recover your door locks, it's a matter of troubleshooting to find out where the leak is. In general, the way the system works is that the driver's door is manual and the other 3 doors, the trunk, and the fuel door are slaved to it. There is a vacuum valve in the driver's door that goes to the locked or unlocked position when the door is locked/unlocked. The other doors, the trunk, and the fuel door each have a vacuum actuator with two lines connected to it. These actuators tend to develop leaks in their diaphragms. There are posts in this forum that give detailed procedures for troubleshooting, or you can just start taking the doors apart and checking each of the actuators for leaks. They cost about $40 each to replace. If you don't care to fix them, you can just leave them disabled.