If you want to stick with Ohlins and don't want to modify the ones you have, in about 6 weeks time, pukka factory built Ohlins will be available specifically for that bike.
Sell the ones you have and put some extra $$$ towards the right ones. Ohlins, Works, YSS, plenty to choose from.
Go on you know you want to.... you are worth it and you only like once!