Meh. I'm not a big fan of pepper spray, personally. I mean, it's better than trying to swat a guy off with your girly little hands, but sometimes it just pisses 'em off more than anything.
Get a lock. Please. That guy sounds like a real creep. I mean, he turned up half naked at the foot of your bed? What do you think was going through his head?