Hard to tell without seeing the back side of the new cluster. I see what you are getting at though.
Here's the cluster I think will work from the manufacturers web site.
Note the location of the wiper switch and headlight switch. Not sure about the emergency flasher switch location though.
View attachment 1716088692