It looks so much more complicated this way.
a note:
You use the notation Vab ,it is a bit confusing,since that notation normally means the voltage between a and b.
I think you should have used Vb instead.
I didn't check the Zth expression...too long;)
And,
Yes, for Rs not zero we have to take...