It sounds like you've really been thinking about this. If you keep the driver I would take out the 3-wood. You could use the 5-wood off the tee, wouldn't lose that much yardage, and it's easier to hit off the fairway. Or, you could take out the driver and use the 3-wood to tee off with. Have you asked your pro what he thinks you should keep in the bag?