Yes, you need to report NQSO/RSU sales from your 1099B, even if they are already on your W2.
If they are both lumped together on one 1099B, don't worry about 'separating' them - they are treated the same.
Just enter the 1099B information as follows:
https://ttlc.intuit.com/replies/6547345
(Check the first box on the "Tell us about your situation" page - it shows that ESPP, ISO, NQSO, RU and RSUs are treated the same).
