Yes, even as a child, I noticed an undercurrent of violence in the attitude of Goat Peter. (Primary reason I never located the sequel -- which, it turns out wasn't written by Spyri but by her translator -- was because it has Heidi marrying Goat Peter. And I thought that she was way too good for him.)

Heidi very much fills a traditionally female role. That of caretaker.