Your case in EB1-OR sounds solid.

For professors, USCIS treat "differently" in the EB1 cateogry. But the university has to sponsor and file the I-140 for you. It seems that the words you used to describe your qualifications are not very appropriate. This could be same for EB1 as well. A lawyer can do these work for you with much better results. Make sure that he can revise your recommendation letters, not just assembling a petition letter.

It could tricky to argue ur exisiting case in NIW since you probably have exhausted your evidence. I would suggest discussing with a lawyer first before making a decision. Some lawyers might not charge for the first time.