@Colleen ********
you have a totally workable plan comin' in, applying for the 90 day Non-O, getting it, getting a re-entry and then returning before that 90 day stamp is up to apply for the year extension AND it seems to fit your time line for travel as well
Good luck with it (y) ๐