Spirited ones especially find lots of things overstimulating, and Spirited/Grumpy is an interesting mix too!
When you try to help him transition between sleep cycles, are you there when he stirs - probably about 45 minutes in - or do you wait for him to get fussy? We had success with re-inserting pacifier/dummy the moment ours spit it out between sleep cycles so she never really woke fully and settled back down (she was Touchy). We had to avoid eye contact and be there BEFORE she stirred, but she was predictable as clockwork with the 45 minutes so we'd go in around 40 minutes, wait for it, re-insert without even looking, before she even opened her eyes, and then sneak out again once she resettled a couple minutes later.