Oh, dude, you need to read this: The Dark Midnight Series (http://www.stoic-simplicity.net/imperfect/fiction/angel/darkmidnight.html), by Misty Flores. It's a BtVS/Xmen crossover, shipping Cordy/Angel and Logan/Marie.

It also happens to have a *HILARIOUS* scene just such as you've just wished for.

Highly recommended.