If only your J-1 waiver is approved, you can file I-485 or / and apply for H1-b. That is OK. There is no relation between H1-b and I-485. J-1 waiver is the base of them.