Looking at that diagram and comparing it to mine, then it's wired correctly. So now I just need to put the components back together and try firing it up. Yes, I'll need to clear the area of any paint, use the correct washers as previously recommended, same with the larger screws to make sure it's grounded properly.