He's changing. At this age, they change a lot in many ways.
It's a phase. My kids did that too. It passes.
I would NOT make it into a "control" issue or "punishment" thing. For us, I would tell my daughter she can do QUIET things...or turn on the t.v. (since she could do it by herself anyway), and she could not turn on any lights, and it was fine. Otherwise, she had to stay in her room... but luckily, this "phase" did not last long.
At this age, it's hard for them... hence "terrible 2's" manifestations. But it's okay.....main thing is to "teach" them how to navigate their world.
He's napping fine and I think his bedtime routine is fine too.
Just keep patient... nothing upsets a child more than when angry Parents punish a child for something they are not doing on purpose, and when they don't even "know" they are doing something "wrong." To adults it's not convenient...but for a child they don't mean any harm in it.
The 2's age, is a time of MANY transitions for a child.
I know, it's not "fun" for us adults...but well, it'll pass, and then before you know it other phases may come up.
This is a great book series- you can get it from Amazon.com:
"Your Two-Year-Old: Terrible or Tender" (Paperback)
by Louise Bates Ames (Author)
It's a whole series for each age of the child. It's a quick easy read.
All the best,
Susan