You are correct. Besides the attached photo of the original dash of my '68, you can refer to the '68 owners manual confirming those correct locations.
Note that there are diagrams in the '68 Sales Guide, Parts Illustrations book and the '68 Pontiac Service Manual that incorrectly show the lights and wiper switches switched.
See my old removed web page where I discussed the errors: http://web.archive.org/web/20091027092352/http://www.geocities.com/jims68fb/DocumentationErrors.html