Mini PC to replace fiber modem and wifi router. How to proceed?

My current internet setup is like this (which is common for most people).

    
fiber line from ISP <-> ISP fiber modem <-> Personal wifi router <-> switch

  

This is working fine with no issues. But I need to power two devices. I want to reduce this to a single device.

    
fiber line from ISP <-> Modem+Firewall PC <-> Switch <-> AP1,AP2...

  

From my initial research, what I need is an SFP module which can be attached to a PC which supports SFP. OPNsense should be able to handle most SFP modules.

What is the community's take on this? Is this worth the effort? Can I find a mini-PC which supports SFP? Will it be cost effective?