Key areas left to improve with Mercedes 'one upgrade away from victory'