I would probably apply for Advance Parole before my permit expires and adjust through my boyfriend (we're planning on getting married in HI or PR next year anyway).