Hi,
I would consult with a attorney, if your attorney is not available it might worth to get a opinion from another attorney.
Here’s what I think based on some things I heard before.
1- If the judge has already granted cancellation and you’re just waiting on the granted letter, it may be faster to stay on this route. Your granted letter should be in the next fiscal year, that starts in October.
2-If you’re still in removal proceedings, you typically can’t just file an I-485 through USCIS based on your I-130, unless your case is terminated or administratively closed by the immigration court. You may ask your attorney to file a motion to terminate proceedings based on the approved I-130, then adjust via USCIS. However this is wild card considering the latest with the current administration.
Hopefully you can get in touch with a attorney and be able to clarify, my suggestion is to not take any action without a legal advice.
Good luck!