I gag at any other pairing of JC, but the JG thing doesn't look romantic to me. He looks like he's trying to psyche himself... as Claire did w/FF. Trailers are misleading. For all we know they will show Jamie in tears/sick after the deed. And they better include his "this isn't love" clarification to G.
The whole scene is just so flawed. The fact that she tries to call him by his real arm and then tells him she loves him. You’re right, they need to keep in him refusing her and telling her she’s just a girl. Make it clear that Jamie is there in her room because he doesn’t have a choice and is protecting his family, but he is not emotionally present and refuses to allow her any part of who he really is. That belongs to Claire.