I have installed One UI 6 and then did a full factory reset without using backups. So its a completly fresh install.

When set to default, Whatsapp now play the default notification tone rather than the default ringtone for whatsapp calls.

Secondly, the notification tone follows the ringtone volume stream rather than the notifications volume stream.

I've contacted whatsapp support through the app but they are utterly useless.