You are right the front dose need some attention.Fork revalve by a suspension specialist.
Cant believe you have Ohlins rear shock but still standard front end!
Its not that good to start with, but with an Ohlins rear end, surely it just highlights how bad the front end is!