Spiral galaxies, elliptical galaxies and the large-scale velocity field within 3500 km/s of the Local Group