Using OpenAerialMap for OpenStreetMap has its issues as well. Personally I map only using a GPSr and try to stay clear of any aerial mapping.