Best solution is: work with University H1B until the position is terminated. When H1B petition date starts in 2009, try to file a quota based H1B from a profit organization. Non-profit H1B can't be transferred to profit org at all. So, you can file a NEW H1B from profit organization while you're working at the university and join that profit organization later when your university term finishes.

Remember: a person can hold multiple H1B at the same time, but he/she can work in one place at a time.

I was in the similar situation, this is what I did.