yeah, i just worked it out again on paper and re-convinced myself that my rotations were correct. this stuff is slippery!
actually, i used super samurai as my main learning material, but it contains all the same equations as you gave there. for someone like me who never had any formal math training, it's good to read as many versions and explanations as possible. sometimes one will give you a slightly different viewpoint that makes the whole subject click.