USCIS gave extra time on Visa and I-94, can not file extension for 7th yr on approved I-140

[Abhi03]

I have a valid visa and I-94 till Feb 2019 but my actual stay of 6 years in US  is ending in June end (asked my attorney and they said USCIS has given more time by mistake). I have an approved I-140 but problem is employer can not file for extension before 6 months of visa expiration even though my 6 yrs are ending in June end. Extension can only be applied in August. Please suggest what are the options, is it ok to stay beyond June or can we apply for extension before Aug or what is the best approach ? It is a state of confusion for me.

Thanks in Advance! 

[satya2k1]

Seek your attorney's advise. The other option is to change employer and apply an extension with approved I-140 right away.