I wonder if it might be time to cap his nap a bit? Am I reading right that you have an infant as well? Do you ever talk to your two year old out of the moment about your expectations with bedtime? We were having horrid issues with DD3 (low sleep needs so wakes before anyone else in the morning) being super noisy playing in her crib so I had a chat with her about what I expected and how we were all sleeping so she should try to be quiet...amazingly it worked, though I do keep talking to her about it just in case.