Star Trek Fic Finder

I'm looking for one specific story that I know is somewhere out there but have not been able to find again for the life of me, and I'm also interested in a more general search for fics after seeing the episode By Any Other Name. But first is first:

1. I first thought that this fic had to take place during STiii-STiv, but I've since realized that the story could've started earlier (during the previous films, or even the series itself), and followed along until the fal-tor-pan and its aftermath. I also can't remember if it was a stand-alone or a series of fics.

What I can remember is that when Kirk goes to free George & Gracie from where they've been trapped in their underwater container by the impact of the ship's crash near the end of TVH, he wonders something to himself along the lines of if it would really matter if he wasn't able to get to the surface before he ran out of air (or something like that) - because Spock either can't recall their connection (it might've been an actual bond, I can't recall), or he can remember it, but not the emotion associated with it, and therefore does not want to acknowledge it anymore.

I am also pretty sure that (either later on in that story, if it was a one-shot - or if it was part of a series, in a subsequent story), we get Spock's POV of that moment, realizing that Jim doesn't think he (Spock) cares whether or not Jim lives or dies (or something like that). I'm pretty sure it ends with them together again...

I'd really appreciate it if someone is able to help me with this. I've done a ton of searches for fics covering ST3-4 and/or fal-tor-pan (I've even checked any that mention whales), but while I've found several wonderful stories, I haven't been able to find that one, and it's started driving me nuts. *g*

2. The second (more general) search I was wondering about is due to having just seen the episode By Any Other Name for the first time, and wondering if there are any fics that mention the similarities between the situation that Kirk faced in that episode, and what he went through on Tarsus IV (his reactions to the "neutralization plan" seemed to indicate that he'd made that connection...) I've looked through a couple Tarsus lists and there's that wonderful list of episode-based fics that I really love, but I haven't been able to find any that reference that episode... If anyone knows of any, I'd love to read them.

And while I'm posting, actually, are there any other resources like that one I linked to in the previous paragraph, that lists fics based on episodes?

Thanks for everything!