Phone [Q] Mac Address issue after stock firmware upgrade

I recently upgraded the firmware on my wife''''s Samsung Galaxy S2 SGH-T989D to 4.1.2. I had updated mine to this firmware about 6 months ago, when it was made available through kies. We both have the same model phone.

When I did this, it somehow changed the mac address on my wife's phone so it matched my own. This was discovered after quite a bit of troubleshooting, and was a result of us not be able to properly connect to the Wifi...Needless to say this is incredibly annoying and I am looking for options. We have done a factory reset on both phones to no avail.

So I am thinking I am going to root my phone, install a custom rom, likely The new beanstock rom and get an app that will spoof my mac address...I believe this is the only way to go. I have contacted Samsung directly and they are not able to help me it seems, I have been waiting for 4 weeks now.

Does this seem like a reasonable approach?

Thanks in advance