Oaktown Pete, welcome! Great job methodically attacking one issue at a time. We'll help you get her running great again!!
Sometimes we preach around here that when you tackle too many issues at one time, you can't always figure out what was actually causing the problem in the first place, but you're doing it the right way IMO.