Sound like you have it sorted.

I use endpad as does the latest OzTivo image, it allows you specify padding by channel and time. Here in Oz the commercial networks can run 15 minutes late in the evenings, so for shows on commercial stations I pad 18 min between 7:30pm and 6am. The rest of the time 5 minutes seems enough.

Peter.