Yeah, Han has some bad luck when it comes to Ord Mantell and bounty hunters...
This is what I consider to be the canon encounter.
However, if it were up to me. My personal way of telling the story would have been to have Han encounter Boba Fett on Ord Mantell and end the story with some Rebel soldier sacrificing himself to save Han from a disintegration shot from Boba.