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.

1-From the first route Fate/stay night.

2-They're not, imho. I feel like Rin from SN is stronger than UBW's, and it's showed all throughout the anime.