I suggest you leave US on Sep.7 and reenter at same day

as visitor. When you leaving, you just need to give your old I94(from TN). Take 23 days as your vacation and at Oct.1 do the same way to change your visitor status to H1 .