Recommendations for pump set up is going to depend on what you want to do with the boat. If you like the boat as a cool family cruiser and don't really care about increasing performance beyond where you are now, I'd recommend just rebuild the YJ as it is. If you are planning on upping the performance and want the adjustability of adding a droop snoot or Place diverter, you'll want to invest in the Energizer kit.
