Looking for Khirk gene alteration fic Edit:Found

[shinidraco.livejournal.com]

I know there are two big Khirk fics where Khan has a specific gene for extreme anger/savagery and McCoy invents a procedure to fix it. One is Moonraker and I'm looking for the other.
It involves the command crew working together to steal Khan then Kirk takes Khan to Alberta and explains everything to him but they're hunted down by Starfleet's SWAT and Khan protects Kirk. Eventually they make it back to San Francisco and rescue the other cryotubes. And there's this scene where Khan and Kirk are together the night before and Khan is either imagining or actually talking with Joaquim about Kirk and they end up having sex. During the rescue everyone thinks Khan dies. Kirk takes the augments to New Vulcan for asylum. Kirk is later travelling the world before the Enterprise leaves for the five-year mission and is in Morocco when Khan sneaks into his hotel room. Then the very end of the fic is Kirk when he retires from Starfleet going to New Vulcan and finding Khan in an arboretum in a Canadian environment.
Thank you for any help!

I did finally find it, it is Tame This animal I have become over on AO3. http://archiveofourown.org/works/1497262/chapters/3161977