if you are under OPT entire year, than you are still under F1, so 1040 NR, and you still should have tax treaty benefit, since there is no time limit, IMHO
if you are under partial OPT and partial H1, depends on the days, of OPT, 1040NR for OPT >183 days.
you should be able to get your SS and Med tax back.