@Jon *******
I think it might be some wires crossed here. You didn’t go from 5 years extension of stay based on a Non B to a 90 days Non O visa, but you changed your extension of stay based on Non B to extension of stay based on marriage, witch normally starts with a 90 days Non O visa, but since you already was on an extension of Stay based on Non B you just changed the reason of your extension at one point to an extension based on marriage. You didn’t get a whole new Non O visa first.