Linux Mint 11 Rulez....
just curious, have you considered the scarebird kit? I've read some good things.
I'd vote for swap.3, your current wheels will fit and there are more pads available than for Granada brakes.
With K-H disc brakes up front and properly maintained drums in the back, the pedal has little free movement and little give to it once engaged. It is a quite firm pedal, but you can modulate the forces easily enough.