FOUND: Time Travel Bilbo
Ok, so someone else just posted a request for help finding a fic and at first I was sure it was one I was also looking for. But now I'm not sure.
I'm looking for a time travel fix-it story where Bilbo goes back in time to before Gandalf arrives to ask him about the adventure. He arrives early enough that he decides to go to Bree to get a sword made, or have some piece of kitchenware fixed. I can't remember which. He gets to Bree and finds out Thorin is the blacksmith and decides to be sneaky in his approach. He finds Kili being attacked and helps him, then befriends him. Kili tells him his uncle is a blacksmith and things go from there.
I also remember Thorin getting frustrated with Bilbo and noticing how flustered Bilbo got when he wasn't wearing a shirt. So he kept taking his shirt off. Bilbo gets back at him by creating a gift bask and offering to set him up with some of the older human women, because of his advanced age. Kili is troubled by Thorin's behavior and calls him out on it.
Sometime after that is when they head back to the shire. Pretty sure it is a Bilbo/Thorin slow burn pairing. And I believe Dis was there as well, but I'm not 100% on that. After going through 70 pages of "history" on AO3 and not finding the story, I am worried it might have been removed.