your F1-OPT time income is filed as F1, and your H1 part income (dec. 2004) filed as H1( eith non-resident or resident)
i think you may better off using tax treaty deduction.
i think you may better off using tax treaty deduction.