marrying ur GF might be ur best option. Just an advice, keep in mind that it takes couple of months to get ur paper worked approved after the marriage to straighten ur legal status. I see that u still have time till next yr. But its always good to plan ahead. Change of Status process takes long sometime