Le Gall's "Brownian Motion, Martingales and Stochastic Calculus" may be a good fit. You need to be comfortable with functional analysis though, cause he uses it sometimes to streamline proofs.