If you have a job now, leave US as soon as posible,

then try to apply H1 back.

After you get H1, marry your girl friend, submit your I-485. Remember you have to marry before your girl friend's I-485 approved, otherwise she can do nothing for you.