Steve, I compare where you are now versus where you were when you first got here and it is nearly night and day. Very similar as many - I dont want to look back at my first month on here as I was doing the same dumb things. I too had OM1 and OM2. I dont know where those guys stand anymore and dont care. I have no idea of W's contact with them and dont want to know. If she wants me, she will profess it to me and I will learn to trust her. I hope you are on the same path.
As for moving back to Japan, is this something that your W would be happy with? Are you going mostly to escape your parents or more to get W away from OM1/2? Just remember that there are still men in Japan the last I checked. What I am trying to say is that dont move there as a means of escape. If you truely feel life was more enjoyable in Japan, by all means move there.
As you know my W is from Asia also. The thought of living there has crossed my mind as I always liked visiting, but I think in the long run, I would miss where I was from too much. That is just me and I know of many westerners that have made the big step and become an expat in asia with much happiness. You have lived there before and it sounds like you liked it. If you feel it is your destiny in life to emerse yourself into Japan culture and language - do it as it will make you a better and more happy person. Just dont do it for the wrong reasons and live later to regret it.