If you've been away from US for two years, you do not need to apply for J1 waiver. You can apply for H1 directly.