Yeah, dang. I fried two of them... that's exactly what I did. I had had power in the driver before I hooked up the diode.
So, as long as the laser is hooked to the driver with nothing in the capacitor, I should be fine if I just leave it hooked up and only turn power off and on at the PSU...