I would go to ho chi min city in Vietnam. Get the non o based on marriage. Return then get the non o extended for one year. I wouldn't worry too much about getting back in because your circumstances are quite different to those that have been denied. You will have your wife with you so she can communicate for you.