More than likely you need a new master cylinder. Clunking is the number one sign it has failed.
Just fix what you have. I would have hydraulic surge discs everyday over electric drum brakes. I have a travel trailer with electric drum and one of the thigs I am planning by the end of the year is...