Need help - promotion,140 approved,PD became current

[ericball]

Hi all

I have 140 approved as individual contributor and PD is oct 2008

I was promoted to manager 6 months back, accepted the position and lawyers are in process of filing new labor

According to jan 2012 visa bulletin ,PD for previous case became current

What are my options

1) switching back to previous position and file 485 ? When do I have to do it , before filing 485 or after getting EAD ?

2) wait till new labor as manager gets filed and file 140 and 485 together but having risk of retrogating PD after the way it was moved in late 2011

Any help,pointers would be really appreciated