Kartssa

I'm currently working in the US on EAD/AP which I filed my I-485 back in 2012 when I was current - EB2 India PD Mar 2010. I've switched jobs a few times since and have left and entered the country frequently using my EAD/AP combo card. A couple of years ago I married a GC holder who will be attending her oath ceremony in a few weeks. Should I file a new I-485/I-130 to get a FB1 green card? Or should I just file I-130 and with a letter to change the existing I-485 to be family based and so current? I'm thinking a new I-485/I-130 is the way to go to avoid any confusion...