+1 on Stu recommendation. I don't know about ones that contain sunscreen, but Trumper's unscented moisturizer is great (pre or post shave). I use mine as a post-shave.

Two other lines that have...