Enhanced Unified Theory with Forward-Speed Effect Taken into Account in the Inner Free-Surface Condition