all else fails go back to android 4.4 and use mygica media center to replace kodi in some cases you have to manually update repos but still works like a charm
I found if you do a fresh factory reinstall ( factory firmware, pinhole, ect) then do the upgrade the 5.1 fw will work fine. does run slower but it is a better than buy a new box in some cases.