Would you please use HBD branch in your case? In the HBD, there is kernel 5.4, which includes SFP support for module quirks.