FSA Gossamer replacment

I've an FSA Gossamer crankset with BB30 and Shimano 105 5800 front derailleur.

I'd considered replacing the crankset with Shimano 105 R7000 crankset with wheels manufacturing shims but now realise the front derailleur is not compatible with the newer R7000 version. Am I correct?

So thinking of keeping it simple by:
1, buying a new FSA Gossamer crankset (from Ebay), and avoiding using shims or
2. buying a new 1shimano 105 5800 cranket with wheels shims

Any advice?