Complicated Visa questions: Non-profit H1B application ?

Asking for a friend.
He got laid off in November as a profit H1-B holder. Then he immediately submitted F-2 petition (His spouse is a F-1 student). Now it is still pending. But now he is applying for a job in Non-profit organization. If he can get the job, then he needs to reactivate his old profit H1-B or apply for a NEW non-profit H1-B? How to deal with the pending F-2 transfer?

thanks in advance!!