YJ and CJ supertops are the same. Get uppers for a YJ, and YJ hard 1/2 doors, and it should all fit together fine. I actually ordered a YJ top for mine so the soft doors would close on my hard door striker pins. You can order parts directly from Bestop if you just need a part or two.
85 CJ7 258, borla header, Team Rush, MC2100 ,optima batt, Warn 8274, agr super box 2 & pump, T5 w/ B&M shifter, centerforce 2, superior 1 piece axles, warn hubs 2.5 in lift, 31" BFG MT
85 CJ7 258, A/C, T176, MC2100, Team Rush, Warn XD8000i, superwinch hubs, 3in lift 31" BFG AT/KO