My case is

Jan 06 - May 06 = F1
Jun 06 - Sept 06 = OPT
Oct 06 - Dec 06 = H1B

I am from California. I'll be filing as a non-resident for federal as well as state, will take advantage of the US-India tax treaty and I'll be using the following forms.

1040NR
540NR_short
8843

I just wanted to run this by the tax experts to make sure that I am on the right track.

thanks...

Yes, everything is correct!