fresh water

my second delivery of water came today, and it was quite fresh.
when i placed the order, i was feeling indulgent. 3 cans of water, 1 case of 1 litre bottles, and 1 case of fizzy soda. please. unlike last time, i got no confirmation, but after a couple of days, there was a knock at the door, at 8:30am.
same delivery guy, and he walked right in, brushing me as he went past, and then immediately apologizing. no matter, its a very narrow hallway for two people and two cans of water. so he lingered, i guess the rest of the order was downstairs. i said ok, where is the other can? i gave him my empty can and asked for the bill. he started to talk about my living situation, and asked questions about who i stayed with, who i slept with, and when were they coming back. 'thats none of your business'. at this point i felt uncomfortable and suggested he go get the rest. he left.
he came back, half an hour later. no bill, no fizzy soda. he had said that my deposit would cover the cost of the 1 litre case. so i attempted to make out a bill for my own record. he asked to use the bathroom by basically unbuttoning his pants as i was adding up the figures. he gestured and said that we was going to go. i let him, because i didnt want him relieve himself on my floor. i turned around. he came out, and i tried to get him out as fast as possible. i found my old bill. he sat on my bed. i asked him to get up. i showed him the bill i had made. 3 cans + 3 deposits + 1 case - 1 deposit. he agreed. then he touched my ass.
so i yelled, dont touch me, dont treat me that way, get out, never come back here again, i will never call bisleri again, i will tell my aunty and you will be in BIG trouble. you do not do that again. ever. !
i doubt he cared.
i gave him the agreed upon money, and he left.
he came back 10 minutes later demanding the deposit. i yelled again, that i had returned the bottle, therefore was entitled to the deposit. no luck. i gave up.
so my plans to enjoy the morning free from class, and get to the office earlier were slightly derailed, and i basically sat stunned replaying the situation in my head. and then spent a good two hours cleaning the room.
when i got in, i finally explained to the director why i sometimes dont feel like walking around on the streets, why i sometimes take a while to come in... its not because im scared, its because i am sick of dealing with it. the morning being an extreme example of the more common brush by, hand touch, or stare down. she advised to make a scene. slap if need be. and move out of their way. all things i can do, although i still feel quite strongly that i should never have to.
so now i dont know what to do. i need water. the water man is rude. based on my current consumption, i have approximately 2.5 weeks to sort this one out.

update: a friend filed a complaint, and i re-filed a week after. the man is supposedly being 'sacked' on june 15. once his paperwork goes through. and will never come to my building again. they seemed to take it seriously, although i doubt that if its taking weeks of paperwork, the man will actually be sacked. as long as i never see him again, im fine.
update 2: my tap is now leaking.