What do you weigh roughly? Apart from the beetle map being a priority, having your forks and rear shock modified for your weight was a big and beneficial change for the better. Once you start to get around 90-95kg and above some major handling/rideability gains to be made relatively cheaply if you use the stock forks and shocks. A suspension guy will customize your spring weights, rebound and compression valves, shims and oil weight. Also have a Schraeder valve tapped into the reservoir if you are going to keep it. Plenty of threads on the options.
I did not know enough to do it then but doing it now would take the forks and rear shock off myself and then ship them to someone well regarded (and reasonably priced). The GRiSO has rebound, compression and preload adjustment on forks and rear shock so no need to go aftermarket - just needs tweaks on the internals. Ghezzi seems to be the suspension expert.
The Norge is much more basic with minimal adjustment on the forks so I went Matris front and rear for under a thousand USD total from Carpimoto in Italy.