There is an excellent set of lecture notes by Prof. John Norbury on both quantum mechanics and quantum field theory. These are freely available online. Just google norbury+physics.
In the quantum mechanics lecture notes he essentially follows Griffiths' book but there are a lot of problems and...