Wow,what a bodge fest.you expect some little jobs when buying somebody else's modified car but thats been worked on by someone or people who shouldn't be touching spanners.
Good on you for working through it and improving it as you go.
I had the same with an rs1600i I bought,every time I took something apart to fix it I found more man made bodges.
Good luck with it,you're on the right road.