Fit LEDs into the headlight. That will give more than enough dipped beam and a better (but not fabulous) main beam.
You could put LEDs into the OEM fog lamps but that will simply give enough foreground light for it to feel like you are riding into a black wall. They only exist because the dipped headlight (with a halogen bulb) is so rubbish.
Remove the OEM spots and store away safe. Find some low cost aftermarket spots that give a narrow beam and set them to align with main beam. You will need a relay to make them light with main beam only. Some angle eye rings around the new spots will give you the daylights light triangle that the OEM spots provide.