Don't worry too much.

Don't worry too much. I think that your PD will be current by the end of this year. I am not expert in this area nor I have inner connect. The reason is that that we have same PD. Accidentally I talked to the INS officer who deal with my case and was told that my PD will be current by the end of this year. He might be wrong but I believe there must be some truth there.
The recent progression of visa bulletin confirm that. I believe that in the next several months, you will be able to submit your I-485 and wait for it to be approved. Once you get your EAD/AP, you have more freedom. Don't let GC control your life. You still need to live your own life. Just be patient and everything will be fine.