R.C.
Small comfort that you're his favorite when this is how he shows it, huh? Are you maybe taking too much responsibility for his behavior? It's not your job to calm him down, it's his. I'm quite sure from what you've said that you've taught him how to be comforted and distracted. Now he's old enough to start practicing on his own. Instead of trying to "fix it" when he whines, tell him you're sorry he's upset and ask him to come play with you when he's done. Then try to ignore it and happily focus on him only when he's in a better "mood."