I believe you need the first one. The important part is that big round thing, which is the diapgragm that has failed. I don't know what that other, rectangular thing is, and those second kits don't look like anything I've seen in my pump. I'd look in my Bentley but it's a mile away in the car, and it's pouring.
Really, though, what BurnYourMoney is suggesting is the way to go. Look here or on vortex for someone selling a used mkII diesel vacuum pump, they're cheap because they basically NEVER fail. I rebuilt my mk1 one (like yours) twice, then upgraded and never looked back. Yes, it's cheap and easy to rebuild them, but why do it at all if you can score a better used one for just a little more money?
The Mk2 pump just bolts into the same hole the old one came out of. It doesn't have an output, though, just the "suck" hose from the brake booster and hvac control. I got a T from the autoparts store and T'd the old output line into the crank breather that runs to the intake. You could also just plug it.
Luke