They both offer great protection and a little goes a very long way. I got the second one in Sephora's Sun Safety Kit this year. They release the kit every April for around $35 with close to $200 in product samples. All proceeds got to Skin Cancer Research. It sells out very quickly, but would be worth looking into next spring for you to try several products.
I use this random generic for my body that DH orders from work that's good but cheap. I've never seen it in stores though.
FCG- I've heard great things about both Shiseido SPF. I have combination skin... does it feel greasy?
It doesn't to me, but my skin tends to be dry year round. I honestly put it on and it doesn't feel like I have sunscreen on my face at all it's so light. Sephora gets rave reviews on both of those products and has it in store to check out samples. It's really a lot better than the drugstore brands and it doesn't seem to sweat off too much if at all. I'm allergic to so much and I've never broken out in it or been bothered by the scent.
For face I use NARS pro-prime with SPF 30. I use this daily as a primer. It has a scent but not a typical sunscreen scent, and I really like it. The tube seems small but it lasts me quite a while.
I actually use this (based on misshark's recommendation). I love the portability of it and carry it in my purse. The only thing I wonder is how to tell if the powder/SPF is coming onto my face (not sure if I'm making sense)...