Question about changing to S1 visa

Hello, I currently have an S2 type for China as my fiance is working there..We are Irish and will get married in Ireland in May. My S2 doesnt expire until September 2015. Do I need to change it to an S1 before re-entering or can I wait until it expires after I enter and apply for an S1 then?
Many thanks,
Jess