I had similar issues a few months back. For the doors, keep your eyes out for panel vans as they seem to pop up more often and both mk1 & 2 fit. If you get a mk2, you'll just need to spend some time altering the internal door handle as they went to a XB falcon mechanism.