I also have similiar situation. As far as I know, we are dead in this.
The only way is to wait for Chinese embassy to mercy. Or spend time in China. It has been a big concern for me everyday.
In fact, my situation is even strange. I was marked as no subject and was issued H1 at a later time. But I know I am subject 100%.
I am not sure if Chinese government someday can give us mercy. Indeed the whole situation for me is like a nightmare.