With a bit of luck you only need the crankset; the FD may or may not be necessary.

The triple shifter should be fine, except if the extra click is on the tight side and you force it to engage, you could break the shifter. If it works with the extra click on the loose side, I'd do it that way.