Thanks for the insight, and advice!
I think I'll try the kisses thing. He often does it when he *is* giving kisses though, so its hard to to tense up when he gives me a kiss, not knowing whats going to happen! But we'lll give it a go.