For Schon's sake, I'm glad they went "commercial." Imho, except for the drumming that song's terrible ... kind of like Spinal Tap meets "fusion." Better songs bring out better solo'ing be they commercial or not.
And yes Schon felt "the master" Santana was taking the credit for his work. He all but said so when he said he did most of the solo'ing on the album and got no credit.
And yes, Schon blows away "the master" too ... who only seems to be the master of bending one note repeatedly.