It's not necessarily a one or the other; sounds like you have both if your doctor is keeping the Bipolar NOS (means she's keeping track of the bipolar issues; make sure they don't get "worse", which would put you back in the I, II, or cyclothymic category).

http://www.everydayhealth.com/bipola...-disorder.aspx