As I understand it, the name Trichocereus grandiflorus is a synonym for Echinopsis huascha. There are named and unnamed hybrids under that designation but I'm guessing "Grandiflorus" is not one of them, instead the species name dating from back when this plant was called T. grandiflorus. Does that make sense? The word "grandiflorus" should indicate a species, not a variety, unless someone got a little too clever. The big box stores are putting out these hybrids from Altman's under the Trichocereus grandiflorus name and you never know what the flower will look like until it blooms. Your plant makes very pretty flowers.
I would advise moving these images to the generic E. huascha listing unless you know that variety name to be correct. Maybe someone else with more cactus knowledge than myself can confirm.