Sounds like 'funishment' imo. Real discipline/punishment doesn't have a 'thorough warm up'. Not that I have a problem with funishments - I just have a problem with them being dressed up as something else.

Anyway, glad you enjoyed your whole play session.