Why will you have to rebuild it? Its so hard to find unmolested Type Rs there days. I like your current mods and wouldn't do much more if I were you. But to each his own!