[yantrams]

I'd recommend Feller for Probability seeing how you are interested in rigor and completeness. For Bayesian approach, I'd suggest Probability Theory - The Logic of Science by E.T.Jaynes.