Hi,
Second switch for bunkhouse light is easy. Just put two wires right across the existing switch and run them to where ever you want to switch from. Light off when both switches are off. Light on whenever one or both switches is on. You can either fish the wires through the wall or just surface mount them using plastic wire races available at Home Depot.
If it was me, I would just have one water pump switch and simply move the existing one. If you want two switches, you will need to use two Single (or Double) Pole Double Throw switch's. Google "Three way light switch wiring to find out how to wire them. And you will need to pull three wires over to the new switch location. Again, either pull wires though walls/ceiling or surface mount them using wire races from H.D.
Agree, awful location for a 120 volt outlet. However, I don't recommend putting it right behind the sink either. Reason is that you could accidently touch the sink faucet and the plug contacts at the same time. Not good if you like living. I think I would leave the existing outlet and just wire an additional outlet or two in parallel with it. Like before, either pull wires though cabinets or use wire races from H.D. (you will need larger ones than what you used above) to route the wires.
Hope this helps,
Steve