My one additional comment is that you consider replacing the front rack with a Blackburn lowrider model. You can find them on eBay for decent prices. These racks, as the name suggests, carry the weight of panniers down low, so should help with the wobble issue.

I still use the lowriders that I put on my 1980 touring bike. It is a nice rack.