iCloud Keychain out of sync after Mac user password change
Probably I found an acceptable workaround: 


disable the iCloud Keychain (keeping a local copy)
change password, 
log out and log in again into your User account
re-enable the iCloud Keychain


It seems to work with any need to log out from iCloud and/or loose data.