I agree. I think it's very probable that he intended to shoot, and I think it's very probable that a reasonable person would have expected those shots to kill the person in the toilet cubicle. The interpretation of the law in SA isn't that important to me, as this is their system and I wouldn't necessarily expect the same laws and punishments to be applied country to country. If the punishment under SA law was 30 years I'd be perfectly OK with that.
The important thing for me is that the outcome is the correct one, based on the case that has been put to Judge Masipa. If the court decides that OP intended to kill Reeva, he should be properly sentenced for that crime and will rightfully carry that burden with him for the rest of his life.
If, however, the court decides that OP did not intentionally kill Reeva, he should be properly sentenced for the crime he did commit, and nothing more, as he will also have to carry the burden that he unintentionally shot his girlfriend on Valentine's Day for the rest of his life.