Salaam alekoum,
I voted for option 1, and here's why...
I make NO excuses for the fact that opting not to wear hijab in front of non-mahram is wrong. I know it's wrong, so I do not expect any messages telling me over and over again that it's wrong!
Basically, I'm a new revert...Old habits die hard (astaghfirallah). Insha'allah one day I'll be wearing correct hijab, BUT, this takes a confidence and a strength of will that at present I'm unfortunately largely lacking.
However, I do take many steps towards preserving my modesty. For example, in my workplace (where the employees are all women, although contact with male member of the public IS routine), we have the option of wearing our hair tied back, or of wearing a hat that covers our entire hair. I chose the hat. (I work at a fishmongers, hence the hat!).
Secondly, I wear long sleeved and high-necked clothing at all times. I never wear skirts or shorts, or t-shirts, etc...I never did even as a non-Muslim, I just wasn't comfortable with it.
Thirdly, I avoid unecessary and prolonged contact with men. Especially men who I didn't know prior to reverting...although I never really had any male friends as such. The majority (well, all!) of the people I spend time with socially are female, and we tend to gather in our own apartments for girly chats, rather than go out...
I'm starting back at university in September though, and contact with strange men will be all but unavoidable. Therefore it's my goal to develop the confidence and power of will to begin to wear hijab fully.