I guess it will pass.. it can be so frustrating though.
I agree with some controlled crying, leave him for 5, then return but don't keep picking him up - if he knows you're going to pick him up, he will keep crying.
Lots of attention before bed and time to chill out.
Hope it's sorted soon.
