For probability all the way up to (excluding) measure theory, Grimmett & Stirzaker's "Probability and Random Processes", plus the accompanying "1000 exercises i

For probability all the way up to (excluding) measure theory, Grimmett & Stirzaker's "Probability and Random Processes", plus the accompanying "1000 exercises in Probability" for the solutions, should fit your bill perfectly.