220* is a bit on the high side. I'm running 185 down the freeway but climbs to 200/205 ideling around town so have been spending quit a bit of time working on fixes to lower that temp. If you get a new pump, check the divider distance between the impeller vanes and the divider. You'll want to bend it inward to .060" clerance. No more than .10 clerance or your pump isnt working as it should. Also, get the one with a cast impeller. The filler panels you mention are the uppers. The lower is a single piece baffle. The only aftermarket ones are fiberglass. Check your fan clerance in the shroud, should be 2/3 into the shroud. Have you confirmed that your gauge is accurate? You can try an infrared thermometer to make sure.
Not in a club and about 10 miles from you down Indiana. Feel free to PM me and we could meet up sometime.