Sounds and looks like you have it all.
Just make sure the motor crank is 2822 289 and the shorter link/arm is 2822 293.
If you really want the whole package you could swap out your manual washer pump for the electric set-up. That'll include the washer bottle, electric washer pump and firewall plug w/o holes for the hoses.