Battery questions, INR vs ICR/NCR capacity & safety

Yes.

(Unless possibly in a FET driven light. The FET would allow higher currents from the 30Q, which will drain it faster, possibly overcoming the 400mah advantage the 30Q has.)