I think you need not to connect a resistor between the switch other end and ground you can directly connect them to ground, it will be advisible to put 0.1uF ceramic capacitor across the switch which will help a little in debouncing (still you need to have debounce code) you can directly connect diode from interrupt pin ti switch port.

Good luck