Since you're rarely playing Games, you might want to consider the Ryzen 7700X or 7900 (No X).
The 7700X gives you 10 to 20% higher computing performance with its higher clockspeeds, uses about 10% less power while still offering decent gaming performance comparable to a 5800X3D. All at a proicepoint about €100 lower than the 7800X3D
The 7900 gives you about 40 to 60% higher computing performance due to having higher clockspeeds and four additional cores, is just a touch weaker in games than the 7700X whilst using just about half the Power of a 7800X3D and costing you €50-60 less.
You could either pocket the savings or upgrade one or two of your other parts, a few recommendations being:
Case - Fractal Design Meshify C ~€100
Power supply - be quiet! Pure Power 12 M 850W ATX 3.0 ~€125
Additional Storage - Kingston KC3000 1TB ~€80
Cooler - be quiet! Shadow Rock 3 ~€50
Mainboard - Gigabyte Aorus Elite AX ~€215