U need to apply for a new H1 with validity starting from Oct.

Apply after April 1.
You can still work with University H1 till Oct 1, then use your new Industrial H1b.
No matter university or industry, the total length is 6 yrs.