If you can't find a good windshield in a junkyard, a glass shop should have no problem whatsoever sourcing one.

I used the 32/36 kit when I had a 2.6. The problem I had was the dieseling when shutting the car off. I found that an adjustable fpr was necessary to get it dialed in for running well on the road. There was some tinkering with the linkages if memory serves correct as well, but nothing major. I'm sure the dieseling problem could have been solved with some tuning.

1989 Montero LS
1997 Jeep Wrangler