1: I assume you mean Fate route Rin, not a composite Rin as you have stated here.

2: They're the same. Rin's combat strength changes in Heaven's Feel, UBW and Fate Rin have the same abilities. Unless you mean she gets Saber.