Of course, for safty, with a H1B is better. Since EAD needs to be renewed every year, H1B every 3 years, since your NIW is approved.