I do not have the orange bike, But I would like to offer some assistance. It seems like both of us have issues with the oem R/R, and as they both come with shunt type, they are not mosfet from the factory. About 6 months ago I jumped, I believe the first beta tester on the mosfet on the F8GS side, and have since read this post. It seems like our bikes share a common undervolting story, and the mosfet fixed it for me, as would in on your bike as well. After reading this, I believe that the hookup are the same, which means the install and testing I wrote up would work on your bikes as well, so I thought I'd share.....
http://www.advrider.com/forums/showthread.php?t=781564
