@Vincent **********
, keep in mind that you're NOT getting a Non-O visa, so the TM.86 & TM.87 forms are NOT needed.
You are currently on an extension of stay based on study. You would take documentation from your school and go to section N (where you get your extensions) and cancel that extension. Then you would immediately go get a queue for section L and apply for a NEW yearly extension based on marriage (by meeting the requirements).