That's the jist of it. Of course, there are those who suggest that Rinoa is in fact Ultimecia, but there's isn't much that can back that up to a very plausible level, so generally your take is considered correct.