Yes, when you gave his last name (sort of) when you didn't want to, yes that's unassertive but don't be hard on yourself. Hopefully she will respect your wishes. If she doesn't you may need to make a decision about your friendship, like you said. If you are feeling frustrated and uneasy with her, maybe try backing off for now.