QPSK on baseband question
Yes, you are correct, though your formula puts the constellation points at 0, 90, 180, and 270 degrees, where usually the constellation points are represented as being at 45, 135, 225, and 315 degrees.  Functionally it is equivalent though.