Got Masters from US prior to joining company A. Worked for company A for 5 yrs. Company A filed my GC as 'Application Developer' under EB3 4 years ago. Got I-140 approved and I-485 pending for 4 years.
Quit company A 7 months ago and joined company B on EAD didn't inform USCIS yet.
Company A wants me to join back and ready to file under EB2 category. They have new job desc and title of 'Application Architect'. Requirements Masters + 5 years.

I got Masters but regarding 5 years of experience can I use the experience that I got from Company A before I quit and now they are going to rehire me and file for new labor.

What will happen with number of years of experience in my case?
What are my options?