you are not the only one in this situation, have similar.
I've been contacting CBP and USCIS several times, most of their advises were missleading and basically in opposite direction. I made several calls with same question last week, and USCIS gave me 2 same answers - call your embassy, describe situation and they will guide you. We are in contact with ours, will see.
PS. I found it quite encouraging to hear sympathy from 2 different USCIS contacts and their encouragements, of course, it was not legal advise or something you could use for your case, but some basic human understanding is good to have.