All good ideas, though I just wanted to make one teeny disclaimer about the Vaseline.

Because it's oil-based (and not water-based like most lubes), it is not safe to use with condoms. Some people recommend against putting it near your vagina in the first place:

http://www.goaskalice.columbia.edu/1272.html