B2 with a stamp to leave June 4th, applying for an O1

[Genre]

I have been traveling in the USA since Sept of 2010. I met a potential employer and we have had some not so fun issues with a Law firm we hired Mar. 3rd to take care of applying for my O1 Visa.
I have been staying with my sponsor since November and had to take a trip back to Canada recently. When I re-ntered the US my Passport was stamped with a B2 and I was given until June 4th to leave.
The law firm we have been dealing with fired our lawyer. She was telling us I HAD to leave before June 4th and await the outcome of my O1 Visa application in Canada. The new lawyer who just took over my case, states that I can remain in the US so long as the application for my O1 is sent in before June 4th.
I am very confused and questioning the advice of a law firm that we hired in March to assist us with this visa application and it is now May 24th and it is still not in.
Nervous and Confused!

 

[Triple Citizen]

We are looking at two stages here. Firstly, the filing and approval of the I-129. Secondly, the change of status from B-2 to O-1. Assuming that the first stage itself has not commenced, you should not stay beyond June 4th. Were you actually issued an I-94?
If the employer already has the I-129 approved, then being Canadian, you do not need to apply for COS, unless you really want to. There is a second (and quicker) alternate option for you. Simply exit the US and re-enter using the approved I-129. At the POE you will be granted an O-1 based I-94.

I am very confused and questioning the advice of a law firm that we hired in March to assist us with this visa application and it is now May 24th and it is still not in.
Nervous and Confused!