sorry for not responding earlier - we just moved, so I was without internet service for a bit. In terms of the nap switch - I went with the long am nap/short pm nap because if I shortened the am nap, she wouldn't sleep at all in the pm - just like you've described. The key to getting a 2nd pm nap was to figure out how much total day sleep she needed, and how much A time she needed (minimum) between the pm nap and bedtime. I found that she need 2.5 hrs of day sleep, and needed a minimum of 3hrs between pm nap and bedtime. so, if she slept for 2 hrs in the am (remember, if you go for a long am nap, you need to push that A time gradually out so the am nap gets later and later), I knew she needed 30 min in the pm, and if I wanted her to go to bed at 7:30, that meant she needed to by up by 4:30, so I put her down around 4. The pm catnap gets really late in the day, which is why that approach only works if your bub doesn't need a lot of A time between the pm nap and bedtime. Does that help?
You mention an 11:00 nap for 30 min - did you limit it to 30 min? If he's napping at 11, that's a late nap, and I'd go with the long am nap approach then. Most mums who limit the first nap are offering that nap much earlier in the day (usually around 10). So if he naps at 11 and you let him sleep as long as he wants and he sleeps for 1.5 hrs and is up at 12:30, you'd probably want to try a catnap around 4ish for 30 min or so and see how that works.
With the bedtime antics.....do you think he's OT at bedtime because of the napping issues? If so, that could be why he's doing that. I'd move his bedtime 30 min earlier and see if that helps. If you don't think he's OT, then I'd do wi/wo and pick up the toys when you walk in, put them in his crib, say your phrase "it's time for night night" and leave. Interact with him as little as possible, so it's not really interesting for him to have you there. If it doesn't improve, I'd maybe pick them up once and then say "that's the last time, if you drop them again, you'll have to sleep without them". Consistency is soooooooo key at this age - they will quickly figure out if they can get you to cave in....
hang in there!!!