Dodged a bullet. So glad you kept the BAT before getting a Class-D.
The day will come though when that BAT will become a door stop, or boat anchor, and that will be when Class-D finally get a much higher switching frequency (the technology is on the door step) that will cure the problems you heard.
If you get a chance you will hear Class-D almost perfect if you get a chance listen to that very rare phoenix, the Techincs SER-1, as it already has double the speed of the switching frequency that everyone is using now, but it’s $35k!!. if your a King or President, you can get one.
Cheers George