Shahmir,
It is up to you and depends on what your motivations and preferences are. At the end of the day, both options are very doable and quite likeable. Neither is particularly cheap or easy....
If I were to do something with a Wrangler look today, I would probably get the front off of a TJ Wrangler (grille, hood, fenders) and mate it to the CJ7 body and doors. I would try and keep the original suspension and diffs of the CJ7 and add a good petrol engine along with a surf gearbox.....
But in all likelihood I would restore the CJ in its original shape and would just save my money for buying Wrangler accessories (fenders, roll cage, seats, bumpers etc)....