I'd just do the actual comic book story. It would have to take into consideration that it's a movie, not a graphic novel.
You'd have to recast by now. I like Sean Connery but a lot of the weaknesses of the comic book character were whitewashed in the movie as it was largely a "vehicle" for Connery.