We report on small angle neutron scattering measurements of the vortex lattice in twin-free YBa2Cu3O7, extending the previously investigated maximum field of 11~T up to 16.7~T with the field applied parallel to the c axis. This is the first microscopic study of vortex matter in this region of the superconducting phase. We find the high field VL displays a rhombic structure, with a field-dependent coordination that passes through a square configuration, and which does not lock-in to a field-independent structure. The VL pinning reduces with increasing temperature, but is seen to affect the VL correlation length even above the irreversibility temperature of the lattice structure. At high field and temperature we observe a melting transition, which appears to be first order, with no detectable signal from a vortex liquid above the transition.