Small children use behavior to tell us when things are wrong or when their needs aren't being met. Sometimes they do this in ways that are really annoying for us, but it's because they are only small children and aren't very good at figuring out what's wrong and putting it into words.
As annoying as it is for us, it's good that they do this because the alternative is for them to just grow up unhappy since they can't usually fix their own problems at 2. :)
It's true that ignoring him, confining him better and punishing him may stop the behavior. But that will be because he learns that his needs don't matter and it's hopeless. A lot of the suggestions here will WORK but that's the reason they'll work, which is a pretty high price to pay.
It will be more work for you in the short term, but I really recommend figuring out WHY he's waking up and acting so upset and needy in the night. Is something stressing him out during the day? Has he outgrown his need for as much sleep as before so he's simply wide awake during the night? Is he feeling like he's not getting enough time with you and even bad attention is okay just to have you near? Is he having night terrors?
What does he say when you come in the middle of the night? What's he asking for? If it's attention then I'd make a big effort to give him more attention during the day. Since he's acting so angry, he may be reacting to something that's stressing him out like a change in the family or being scared because he's becoming a "big boy" in other ways (toilet training, for instance) and he's not sure he's ready to give up being a baby.
Children gradually need less and less sleep as they grow, and his bedtime may be too early for him now, or he may have outgrown his need for an afternoon nap. He may need either a later bedtime or an earlier wake time.
For now, I'd try keeping him up a little later and then doing your bedtime routine, which sounds really good. The way I see it, the options that would meet his needs AND yours are:
1. Tell him that mommy needs sleep at night and if he wakes up it's okay to do these things, and give him a few options. You might want to keep a small basket by the bed of wordless books, a favorite toy, a pad and pencil, etc. Let him know that he can play quietly with the lamp on until he gets sleepy again.
2. Go to him when he wakes, dim the lights and calmly tell him it's time for sleeping. Gently but firmly put him in his bed if needed and don't engage him in arguing or discussing it. Just repeat that it's sleepy time. Sit with him to keep him company and tell him you'll stay as long as he lies quietly with his eyes closed. This will only work if he honestly is sleepy, but if that's the case then he should be out again pretty quickly. I've had to do this with my daughter and I just bring a good book or magazine and read while I sit with her.
3. Let him sleep with you or on the floor by your bed. Plenty of people disapprove of this but it can be a God-send for sleepy parents and kids who feel like they need more of mommy or daddy than they're getting.
I think if you work harder at reconnecting with him during the day that things will get easier during the night. It's important to figure out if the main problem is that he doesn't need as much sleep or if it's something psychological, because that will determine what will fix things.
I do feel for you. I've BTDT with 3 kids and now have a baby that does a good job of keeping me from sleep.
The other thing to keep in mind is something that helped me get through an awful lot of sleep deprivation over the years-- remember "This too shall pass." :) Good luck!