Sorry for the long period of silence. Was fairly busy with final exams and the holiday.
Anyways, I tried the 20A fuse and drove around during the day with my lights on. I'm unsure whether they flickered or not, but after a combined time of 2 hours on the road, the fuse was still good. So I put the 30A back in and I swapped back to the old sealed beams that I took out a year and a half ago (good thing they still worked, I didn't feel like going out and buying brand new ones just for the sake of testing this). I was doing my 150 mile drive back to school after a weekend at home and got a chance to test out the lights. For a while I was just running my marker lights (fog lights off) but then I had to turn on my headlights. Within about 5 minutes, they cut out. I pushed the switch in to turn them off and turned my fogs on so I had some light, then I turned the headlights back on and they seemed to work for the rest of the trip. I didn't notice them go out any of the other times I was doing some short 20 minute drives for the next two weeks. Fog lights were off for those drives I think. I was on another long drive though and had to turn my headlights on, and they cut out within 5 minutes again. I did the same thing as last time, and they stayed on no problem the last hour of the trip.
FF to today and another 150 mile trip. I had my marker lights (no fogs) on for about 20 minutes, then turned my headlights on for the last hour of the trip. Zero problems. got to my destination, jeep was off for about 20 minutes, then I drove another 30 minutes with my headlights on the whole time. Zero problems again. Going the return 30 minutes after having dinner, they cut out again.
This is really driving me nuts. Should I just go ahead and replace the relays that are involved in these circuits? Should I install a relay kit/wire harness to take the load off of the main switch?