Yes this hardtop will fit your TJ. These upper doors would work for you:
https://www.4wheelparts.com/p/rally-tops-upper-hard-doors-tjhd/_/R-RLYTPS-TJHD