Personally I've always preferred to muddy the waters by treating it as a fourth-declension noun, so that its plural would be octopūs.