Thanks to a lot of great feedback, I think I'm pretty much convinced to go with the 16 measure variations. That's what I've been doing until now and it has worked great, so I think I'll continue that way.

Rikki, sounds like a very interesting idea. I'm going to have to think about whether I want to get my hands that dirty!

Thanks, Chony