It's not hard to make Goh affectionate. He really is like that in canon. With Taki it's a lot harder, since he won't ever admit to being like that (even though deep down he's possibly a bigger romantic). I have to sneak them in there while he isn't looking. ^_^