MC swap will be worth every penny and is a cheap option since you can buy used R6/R1 MC's all day for around $100 or less.
As for carts, I have been back and forth with Nick about this. The Stoltec cart kit is cheapest option and I'll definitely notice the improvement but I know I will want full compression adjustability as this bike will be used for daily commute, coaching, and of course hooligan fun! I can get the 20mm K-Tech carts cheaper then his GP kit but more expensive then his cart drop in kit.
I race for P1Moto and owner is a parts dealer so he is working on setting up a new account with Ohlins so I'm waiting to pull the trigger until I know if he can get me gold parts...
So basically I'm still undecided with the exception of I'm going full carts with compression adjustability not the std rebuilt carts. I will keep you updated!