The Kawai & Teisco Analog Synths Group

So, I removed the original leaky NiCad from my SX240 a long long time ago, and I am finally about to install a new battery i have a few last-minute noob questions if you will indulge me...

I'm using an 1N1N8 diode next to a CR2032 lithium battery in battery holder. They are both mounted on a piece of perfboard that I will tape to the inside of the synth - the same setup that can be seen here (http://www.gearslutz.com/board/attachments/electronic-music-instruments-electronic-music-production/195179d1285774169-kawai-sx240-question-p1050383.jpg).

I am connecting the negative wire from the sx-240 to the N1N8's black striped side, then the N1N8's other pin to the positive terminal of the battery holder (the side the arm is on), then the negative side of the battery holder to the positive wire of the SX240. Is this correct?

Also, do I wrap the diode's pin around the leg of the battery holder, then solder? Or do I wrap it and then not solder at all?

Many thanks,
James