I think that the next 6 weeks will be a lot of the 2 steps forward and 1 step back. He does seem to be coming out of his funk a little and that means it is even more important for you to keep up your GAL and PMA so that he will start to see it even more since he is starting to become more aware of what is going on in your relationship. Does that make sense?
Have you ever checked out that book I recommended awhile back The Surrendered Wife? It might be hard to find in a foreign country but it is worth a read. I think it could help you a lot with establishing boundaries in your relationship and those could come in handy now and even more so when you move back to Dublin. I found/find it really helpful to sorting this stuff out in my head which is starting to make it's way into my actions.