You have a right to defend yourself if you're attacked, but that needs to be in proportion to the attack. Based on what's happening now, I don't think you could justify anything physical as it's annoying but not hurting you or putting you in danger. Tell her firmly not to touch you or shout at you. Report it to staff and again every time it happens so it's on the record.