I disagree with the suggestion of Griffith's QM. Somehow, Griffiths made an excellent EM book, but terrible QM. I find Shankar's Principles of Quantum Mechanics to be much more comprehensive and easy to follow.