I got two options but what would be the best?

Currently I'm on T1 General and expiring in January next year. I'm employed by the university and they are very certain that they will be able to help me switch to T2 sponsor. I can't apply for settlement because I was away for 1.5 year which leaves a large gap.

My partner is on T2 sponsor and next year she will apply for settlement. Therefore my options are to wait until my employer apply T2 sponsor for me or I get married to my partner and apply as dependent under her T2 sponsor visa.

However I see there might be a slight problem if I apply as dependent after she applies for settlement. As the requirements is that we have to live together for 5 years if applied after 9th July 2012. Does this mean I need to get married before she applies for settlement?

I'm more inclined to apply as a dependent therefore I have the flexibility of working for any employers.