Plenty of ZJ parts out there, check out Clayton's, Iron Rock, Kevin's Off Road (he's retiring, but may some stuff left), and Iron Man.
The biggest weak point on a ZJ IMO is the factory upper control arm mounts. With heaver tires and axles they are prone to tearing off the unibody, especially...