I just dealt with similiar issues you have. Except I ran lean, and I actually melted my piston a bit. It was a wiesco.
I sent my jug and head off to Ken O'Connor Racing, and had him mod the head, perform a trail port, bore, hone, and match a Wiesco up to it.
I havent got it back yet, but I should be getting it soon. Considering what I had done, it didnt cost me too much. It was more than I wanted to spend, but I think it will be worth it cause I wont have to mess with it for several seasons.
Look at this as a time to upgrade some stuff and make a bit more power. The trail port and head mod is supposed to really wake this engine up a lot.