In response to your current draw, try unplugging the display while measuring the parasitic drain. Display draw seems to be pretty common issue. My '17 came with a dead battery on arrival. Got a new battery sent under warranty. Installed it, charged it, and it died overnight. This kept happening for a week. Found 500mA draw, first thing I unplugged was the display, boom down to <50mA. So 1mile lifespan on original display.