switch components? you'll wind up cutting
and pasting two vintage bikes into two frankenbikes.
3*6 and 3*9 will have different rear spacing.
quill vs threadless, different bar diameters.
keep the one that fits/rides the bestest.
sounds like the trek since it has the newer tech
that you can replace as needed.