There's an awful lot going on here. Perhaps you could try moving a few functions across at a time, rather than the whole vtbl?
There are also changes to the coreaudio driver that should be done first - make all PE-side implementations essentially the same before trying to merge them.