I believe that these are
separate issues. I cannot really recommend you either way. If he has no intention to marry you, then no need to think about the question. If you both want to get married, then get married, before or after you go back to China.
To secure a better chance to enter the USA again legally, you need to go back to China asap.