I'm a Sherlock/John-shipper all the way, even if I admire their friendship, too.

I liked the suggestion of another commenter that John should play safe first, but then Sherlock has to admit he wants more - which ought to lead to a fluffy or sexy or even steamy happy end in my world ;)

So, I vote for love instead of friendship, but don't make it too easy for them.