Just FYI, there is now a way to fix the first problem you are facing: http://forum.xda-developers.com/cros...s-drm-t2930672

As a user of a Z2 I too frequently get tired of having to do workarounds...