Master Blacksmith Other than Hattori EDIT [SOLVED]

[Taurus]

So I've found the master swordsmith Hattori and attempted his quest many times but ran into the same bug every time; After negotiating a price we get ambushed by some of cleaver's men and the game kinda just stops after the fight, with Hattori just repeating the same line over and over again "Careful, there could be more in there." Leaving me unable to progress in the quest. I've reverted to a pervious save many times and tried the quest again but every time I get the same thing.

I've done allot of looking around on the internet and it seems that there is no fix for this bug, and I've accepted that.

What i can't seem to find on the internet is the location of another master blacksmith. Is Hattori the only one? If so, is there a way I can spawn in my master crafted swords? I'll even wait until I have the necessary ingredients in my inventory and destroy them when I spawn in the swords. I'll even do it in Hattori's shop and pretend like there’s nothing wrong with my game.

-EDIT-

Ok so like 45 minutes after I posted this problem I magically solved it; I was riding around Novigrad looking for a blacksmith to dismantle some of my junk and I marked the only one that was showing on the map at the time and set off. When I got there it turned out to be Hattori. I was a little annoyed because I was looking for someone other than Hattori. I had the conversation with him where I promised to help him negotiate and I left to go look for another blacksmith to dismantler my stuff. I marked the only one on the map at the time and set off again. When I got there it turned out to be Hattori again waiting for me at the docks. I thought "why not, I'll give it one more shot." and the quest was magically bug free!

The only thing I did different than my other attempts at this quest was I met Hattori at the docks in the middle of the day, not at night like the objective states.

[Living Broscillograph]

Yeah, Hattori is the only one. However, there is a grandmaster blacksmith in Blood & Wine.