Fernando should move up to middleweight and fight Castillejo again