with all the problems you've had, I would suggest you make changes on a minimal scale, so you can treat problems logically, and as they crop up and not muddy the waters by wholesale changes.
on this forum site, I've heard there are some FSM's for download. I've never accessed them, because I have many of my own, but they are invaluable for reference for members who don't have their own manuals.