I did top him! Yet when the bath scene started I see Haato getting screwed!
Really? That's strange. I don't remember having to do anything else to top him and I would send you a save to where I topped him in the shower (I constantly save) but it seems I've overwritten it. I hope you figure it out.
The two scenes were mixed up in previous version of the game (so if you top, you become bottom instead). Latest version should fix the issue.