You need to think about your situation.

As far as I know, only permenant employee is qualified for Green Card. If you are contract job, you might have problem.

You need to google around to see if the contract job is OK for your green card application. Not only refile new H1B. I am not sure if contractor can get H1B approved.