Welcome to the jeep club! I own a 1957/1970 cj5, but I've always loved the cj7's. Does your new jeep have the 258, or the 304? If the v8, it's commonly swapped with a 360. If the straight 6, it's pretty bulletproof. Both are good engines, although the 304 is gutless for a v8.
As others said...