The extra clicks should be inboard.

Make of front derailleur shouldn't matter much at all.

The geometry on the Shimano derailleurs should be identical; assuming the old one isn't worn I'd use it cause the stronger spring will provide more reliable shifting (I've modded derailleurs to increase the tension of that spring).

Can't answer your other questions.