About see him naked at his farm, I think heart isn't requirement for that scene since it can also trigger with Bottom Logan route which we can't get 2nd heart with Ste.
But the rest of this I think it all right!
Than maybe you need the first heart or some likes
I think so.
got 1 heart with Ste can ask to touch his muscles an see him naked