I have not yet panicked while diving, though I believe experience will reduce the panic cycle. I have been doing "extreme" things pretty much all my life which may be why I haven't panicked while diving. I have panicked once or twice while climbing a couple hundred feet off the ground, but as you did, calming reminding yourself that your are "as safe as possible" and taking a moment to think rationally always works, in my experience.
As g1138 said, I think some of us are more prone to panic than others. Those who are will definitely need more time to "acclimate" themselves to new experiences.
So far it sounds like you're doing a good job of recognizing and controlling your panic, and that's the most important thing. I would agree that based on your experiences so far, if I were you, I'd take it slow moving to deeper depths or night diving or "scary" situations.
As g1138 said, I think some of us are more prone to panic than others. Those who are will definitely need more time to "acclimate" themselves to new experiences.
So far it sounds like you're doing a good job of recognizing and controlling your panic, and that's the most important thing. I would agree that based on your experiences so far, if I were you, I'd take it slow moving to deeper depths or night diving or "scary" situations.