There is currently no new immigration law although people have been talking about it. However, there is something going on, known as Deferred Action for Chilhood Arrivals, DACA. Consult with an immigration lawyer to see if you qualify for it.
If it has been at least 2 years and 9 months since you became a conditional resident, you can apply for naturalization by filing form N-400. You may want to do a consultation with an immigration attorney for sound legal advice on how to proceed.
It looks like you have pretty good evidence. I hope retained evidence of your travel and you have pictures of you and her extended family during your visit to her country. I would suggest that, at the very least, you should consult with an immigration attorney to review the RFE and ensure that you are responding to it appropriately.