I'm going to concur with passthepotatoes. This sounds like a totally normal phase in speech development. I think the general advice for parents of toddlers is to just ignore speech problems/difficulties/differences, and focus on the meaning. I think correcting or even discussing pronunciation can make kids really self conscious. It sounds like your son is already pretty self conscious, and you might want to downplay pronunciation even more on that account.