What visa should I apply for at the consulate in Bangkok?Visitors, z visa, or S1?

Hi
I am coming to china from Thailand, I have just finished my contract here. And have a contract in china. But the company will not issue or help with my Z type until just before I start work there. The problem is my future wife is Chinese and we will get married after I get there. But we want to get to gether one month before I start work, so we sort out house ect. I will be living for the rest of my life in china. Also I have already had a Chinese L type for my holiday there last Chinese happy new year, I had no problems getting it in Laos. Confused hope you can help.