Henry_Best:
Do I need a DPDT switch on just the D+ and D- lines to switch between them?
Yes.
Henry_Best:
Or, if all four USB lines are connected to both, will the IDE detect the correct Arduino if I select (in the IDE), say, the Uno to upload to?
No. You can't have two devices trying to drive a piece of wire simultaneously.