Switching between two output voltage
Put the switch on the output and you won't need the diodes. A CD4053 Triple 2-channel analog multiplexor will do the job (you could use it to switch both the input and output if you wish, though this shouldn't be necessary). 

Alternatively you could just switch the amplifier gain down to +1, and then it will pass the signal through unamplified.