Please let me know how you get on..
Im in a similar situation, I`m british my partner is irregular he`s been here nearly 3 years. I`m also trying to find a way to move forward.

Best of luck!