Thanks for the reference to Angle Lake. Looks like a place I would really enjoy poking around!
+1 on recycled for parts. I have only had email exchanges with Aaron, but he does seem to be knowledgable. I think both of those places could do it, it just depends on how exacting you want to be. The repair shop affiliated with Davidson framebuilding in Fremont would probably be willing to do such a task and do it super exacting if that is what you are after. They have access to the framebuilding tools.