Ok I found some more info on this: RESOLVED: Using GE Enbrighten Z-Wave Smart Dimmer driver on different device may cause stuck "Off" status - #24 by JasonJoel
According to that your Switchs, which are 4XXXX model, should use an Enbrighten driver which you were already using GE Enbrigthen Z-wave Smart Switch
The dimmer would use Generic Z-Wave Smart Dimmer which is already what I suggested above.
For user made drivers which may be worth trying, the one I linked above for the switch is correct: [RELEASE] GE 4xxxx / ZW4008 Enbrighten Z-Wave Plus Switch Driver
For The dimmer I found this post: [RELEASE] GE 4xxxx / ZW3010 Enbrighten Z-Wave Plus Dimmer Driver - #59 by JasonJoel
Which seems to indicate to use this driver for the ZW3005 dimmer: https://raw.githubusercontent.com/Botched1/Hubitat/master/Drivers/GE-Jasco%20Z-Wave%20Plus%20Dimmer/GE-Jasco%20Z-Wave%20Plus%20Dimmer.groovy
@JasonJoel is this correct? None of your driver code indicates which models they are for 
and I cannot seem to find any posts for the older drivers.
It is also possible that not ALL of your switches and dimmer are the exact same models, so there could be some where a slightly different driver would work better. I am just going off the examples you gave above and I looked up the device IDs in a database.
