Thanks for the heads up, I'm going to rephrase the statement about gimbal lock and link you article.
And just to be 100% sure, is the approach I'm using the right one: storing a quaternion instead of 3 angles, multiplying, overwriting the rotation value?