Your description of the Corporal portion of the session (blending quieter erotic teasing/edging with CP of ever increasing intensity) seems just about perfect to me. Absolutely love the idea of blending steadily increasing pain and pleasure!