The fastest workaround for your point #2 I have found so far is to download the report from the server like I normally would, Select All and Copy my report's Source XML, and paste it into the Source tab of a New Report that actually has extension .jrxml instead of _jrxml. This then allows me to save and deploy the report as I normally would.