A Non-O is 90 days, there are more than 90 days between February and June, a re-entry permit (not a visa) does not extend your 90 days just keeps the date live when you re-enter
No because the initial Non-O is just 90 days so you'll need a new Non-O for June, get that extended and purchase a multi-entry re-entry permit for 3800B