i used the body shop soy and calendula moisturizer. Good stuff.
I am not sure whether you have sensitive skin or very acne-prone skin (b/c you mention you want non-comedogenic products for your oily skin). It seems you may have very acne prone skin rather than sensitive skin, but of course i cannot judge just based on what you said. There is a huge difference.
Paula's Choice has many good articles on Sensitive Skin, just check out her Skin Care Facts.
The most important thing is that there is no fragrance, no plant ingrediants (very irritating) no alcohol or sulfates, and no AHAs (salacylic, lactic, alpha hydrox, etc.). Look based on those guidelines, b/c some skincare lines sensitive products are actually not very good for sensitive skin.