No, I don't believe a few simple amendments will change the fundamentally flawed nature of section 13 itself.
The other aspect is that section 13 actually provides a two-tiered system of looking at hate speech in our country. As I said, I would hate to be the person who tries to decide, “Okay, this is definitely hate speech, but it's not that bad, so we'll only give a $5,000 fine. This other one is definitely hate speech and it's more egregious, so....”
You know, if you're targeting an identifiable group with hate speech, you should be prosecuted for it. It should be taken seriously. There should be one code for it, not these different principles. If it's just a difference of opinion, if that's what it is, then that's what it should be left at as well.