Both genotype and phenotype are classical terms for the separation of gene and environmental effects for the discussion of Genetics, respectively. This fact would not be modified, and it is still true. If someone would like to include epigenetic effects, and then all other known genetic regulation should be included. It would be more persuasive to use contrasting terms of epigenetic (meaning top of something on genotypes) and epiphenotypic (meaning top of something on the phenotype), respectively.
The context of the word 'epigenetic' is all important.
First, genotype often interacts with epigenetic modifications (e.g. Callipyge mutation). Second, within a single lifetime, an epigenetic effect becomes part of the environmental modifier of phenotype. Third, an epigenetic effect across generations (F3 or greater) is heritable and therefore a genetic effect mediated by meiosis (albeit non-Mendelian). The middle ground of the F1 and F2 generations has potential contributions from both mitotic and therefore environmental as well as meiotic and therefore genetic contributors to phenotype.