If the solenoid specs give 30ms, go with that or slightly more, like 35ms.
Your wiring looks ok to me, but for the battery life, I would try with 3AA without burning energy with diode. Solenoid specs give minimum voltage of 3.6V and your motor driver shouldn't have huge voltage drop, so it might work well.