the new diagnostics for this in America has changed with the publication of the diagnostic book DSM 5. there is now more than two bipolar diagnosis's. Im out of town so I dont have access to my or my works DSM 5 at this moment but your treatment provider can tell you more about the diagnostic criteria for each listed in the DSM 5 and which one applies to you.

btw I see by your profile name you may be in NYC hope you are keeping warm and faring ok with the power outages through this storm. My wife and I got stranded upstate, at least they have a fireplace and I always keep my laptop charged for such emergencies. Keep warm ok and take it one day at a time.