I don't know too much about those TJ engines (only installing one in my YJ right now :roll: ) but I know when I had my YJ engine and my distributor broke inside I got these same issues every time I went in the water as well.
If the TJ has it pull the distributor... I think TJ's are...