Probably number 2, because what you describe for your California case sounds inaccurate. DUIIs are generally not "dismissed" after one is jailed on a probation revocation. But a good DUII lawyer would likely order your California records to make sure. Call a good lawyer and make an office conference, now.
As the ever wise Mr. Oberdorfer says, you won't know until you find out for sure. Get an attorney, get that first case nailed down and it could be there difference between a few hours of community service and weeks of jail.