Judging from the ending, the writers did have S3 planned all along but it looks like it was axed because of all the negative review it got which is just sad because it means they also probably planned for the main cp to reunite in S3 if it ever happened.
1 
I knew it I wasn't tripping. I thought he reminds me of kao too.