I am on a student visa for a course that will end in May 2011. I am newly engaged to another American here on a work permit, who is in the process of switching to the new system and should have no problems. When I get married this time next year, would it be best to keep my current visa as I will still be enrolled at university and qualify for it, or should we be thinking about switching me to another visa as his dependent?