To answer the original questions:

I'm diagnosed BP 1, although my manic episodes have usually been drug-induced. I fit the criteria for BP 2 when completely sober, but I don't know if I've ever had a manic episode that wasn't triggered by substances. Regardless, I get the BP 1 label.

When I've been the most stable post-diagnosis, I charted my moods for a while. They were a very regular 10 day pattern of up and down and up and down. At present I've had dysthymia for quite a while, with breakthrough 1-2 days of depression every week or two. My doc and I are in the midst of trying to deal with that now. Hope to have some relief soon, it's been rough over the last week or so.