Sorry that your dive was so stressful Nikolai, but it sounds like your working on getting a handle on things, the previous advice given here and the checking predive of ... goals for this dive, dive signals, etc. are good ones ... so are the ones about taking a Rescue class, discribed it as one of hardest, funnest, interesting, most rewarding things I've done
I heartedly recommend that you take up the offer to dive with him
I'll vouch for Rig's care and mentoring skill in diving with someone new, he has helped me with my diving, giving positive feedback and is fun to boot ... and not to mention that Laguna Beach is a cool area to dive... I see you're in Riverside. I dive Laguna Beach a few times per week. I'm pretty busy with work these days, but if you ever want to hook up for a fun dive, feel free to shoot me a PM.
I heartedly recommend that you take up the offer to dive with him