@Mike *****
your original Non-O VISA expired LONG ago, you are (or were) on an extension of stay AND yes because of the amnesty you can actually have your current extension expire, take the amnesty days until your funds are seasoned and then go apply for the new year extension with no overstay fine.