1. Use a predive checklist. A written one. Every time. It's just so much easier and safer.
2. Don't dive with anyone, especially an insta-buddy, with whom you've had no opportunity to first discuss priorities and plan the dive. One of the worst dive experiences I ever had happened under these...