Here, I have the same situation except I will graduate by the end of this year. I did not apply OPT because I submitted the I-485(I-140 approved)with I-765. The int'l office of my university told me that it was not neccessay to apply OPT, and if I-485 rejected, I can switch to H4, but I cannot work.