With the aims of overcoming the limitations of the existing basic flow model derived from an axisymmetric generating body and extending the aerodynamic design method of the airframe/inlet integrated waverider vehicle, this study develops an upgraded basic flow model derived from an axisymmetric shock wave. It then upgrades the design method for airframe/inlet integration of an air-breathing hypersonic waverider vehicle, which is termed the ‘full-waverider vehicle’ in this study. In this paper, first, the design principle and method for the upgraded full-waverider vehicle derived from an axisymmetric basic shock wave are described in detail. Second, an upgraded basic flow model that accounts for both internal and external flows is derived from an axisymmetric basic shock wave by use of both the streamline tracing method and the method of characteristics (MOC). Third, the upgraded full-waverider vehicle is developed from the upgraded basic flow model by the streamline tracing method. Fourth, the design theories and methodologies of both the upgraded basic flow model and the upgraded full-waverider vehicle are validated by a numerical computation method. Finally, the aerodynamic performances and viscous effects of both the upgraded basic flow model and the upgraded full-waverider vehicle are analysed by numerical computation. The obtained results show that the upgraded basic flow model and aerodynamic design method are effective for the design of the airframe/inlet integration of an air-breathing hypersonic waverider vehicle.