So consensus is that the modified firmware-raspberrypi package works for both RPi3B and Zero-W if I am understanding the replies.
I pushed an update to the package just now. Again, if you have a Zero-W or 3B, once the package hits your mirror, please remove any manual modifications and update your system/reboot and report back.