Janet Evan's book "Total Swimming" (I think that's the title) includes a lot of different workouts.

I found it a great resource for technique, too.