I had this problem (either u-lock or bottle cage) and I (partially) solved it by getting a cage that does not fully close - ie leaves about 30% angle without any metal. This way if I"m going on a country ride, I take the bottle and leave the ulock home. If I ride around town, i don't bring the bottle cage and put the ulock inside the cage.