I do think you can relink the EB1 to your 485. I have seen many cases doing that. I would consult an attorney for the relink. Agree with you on the WOM, after the relink, WOM will have better chance.
To make you feel better, I have also been in the States for more than 10 years and just received the GC.