Why do you think you need oil-free moisturizer?

And I would suggest a separate moisturizer and sunscreen. You can wear both during the day, but only moisturizer before sleeping.

Nightly application of vaseline or aquaphor should help the dry spots and peeling.