I would have to agree with the Marron comment, Both. I have thought of a fan fic where he gets with Gateau. But the picture you have to see, if you like Marron, is a hot spring trip they made in volume three of the manga. The water level needs to be just a little lower....
Sorry I'm just thinking about it. Be back... must have... cold shower....