Close but not quite, genotype is the actual dna, phenotype is the observational characteristics.

But yes, epigenetics would fall under phenotype essentially.