This video covers many strokes used in whitewater situations as well as whitewater concepts. I have found it to be immensely valuable. There is lots of emphasis on draw strokes and on conserving momentum without spinout. There is also a brief section on rolling; but I would also recommend EJ's Rolling & Bracing video.
I believe that Jackson Kayaks has released a new version of this (the older version that I have is all Wave Sport boats).