Before you go nuts making changes, why not drive the car, watch the
oil temp and as long as it gets up to about 90 degrees centigrade, you're ok. An
oil cooler thermostat is one option if it doesn't. Disconnecting the
oil cooler is another option. As for the vapor lock, once again, drive it and get it up to operating temps then shut it down and see if it restarts after about 15 minutes of heat soaking. If it starts, you're fine.
Now go drive it. There will be plenty of other bugs that will need your attention.