I went with the Year One style ones, like in your pictures, which I got from Shermann's, and ended up having to remove the bump on the drivers side for the battery hold down, and the 'dent' on the passenger side by the hindge.
Wish I would have known the Goodmark ones were more accurate.