I have the exact same bike and have experience power/display cutting out while riding. Here's what I discovered and how I solved my issue, maybe yours is similar...
I ride my bike hard and in nasty, wet conditions. Most times I hose off my bike to remove grime and dirt after a ride. No issue...