EB2 or EB3

[SSara]

This is my case. My employer filled an ETA 750 on May 2004. I received the 45 days letter on May 2005 and replied it the same month. I am now waiting for the certification. My employer filled the form for a position of Architectural Drafter which requires only 2 years of college education (An associate degree). I was hired for that position but now I am working in a better position. I am an Architect with more that 5 years of experience and I could apply for EB2. The problem is that the labor certification will say that the job requires only an associate degree. Can my company still fill the i-140 as EB2 with the same labor certification or... does my company need to request a different labor certification. What do you guys recommend me to do? If I fill EB2 I could apply for i-140 / i-485 concurrently