Tim,
as for the correct plastic covers, the answer is neither. The CS did not come with covers, but if you are looking for period correct covers I believe it should be the ones with the small hole in them.
Also concerning the grommets where the wire enters the housing, they should be the small...