I'd try real hard to remove but NOT drill the pin out, as the ZF shaft is high-carbon steel that easily air-hardens with even slightly used drills. Then you will be into beating the remains out with a hammer & punch or using expensive, fragile carbide drill bits while still laying on your back underneath.
Once the pin is out, an aircraft-grade 8 bolt & nut will work fine and be easily removable. But what normally happens is, the mild steel clevis ears of the connecting shaft elongate, introducing slop. Bushing the clevis holes while leaving the short ZF shaft alone, works best.