Just asking, how many front forks did you swap already, or how is your experience with doing such work? So,every USD fork can be used, you have just to adapt it and do some machining etc.
The XSR (same as MT07) is a low budget bike, so is the suspension also. You can upgrade the suspension with ease, by using the Yamaha original accessories or using some aftermarket offers.
The difference with changed rear suspension and some front fork springs are tremendous. That would be the most recommended way, to upgrade suspension, if there are any complains.