There's a couple more you can borrow from Muay Boran and use in the ring - a crafty grappling coach will show. Cambodian's are good for this stuff and learnt some good ones attacking the shoulder, elbows and spine. The elbow lock off the shoulder roll is done to weaken the elbow and thus the punch is one.
bump for nostalgia I had a lot of fun in this thread How did I find this? I knew you were all curious. I started up a laptop I haven't used since 2011.