Hi Roy, this is one of those taxonomical nightmares sent to tax ageing brains like mine. It seems that the majority of Trichocereus species have been reallocated to Echinopsis. Trichocereus grandiflorus now being Echinopsis huascha. Whatever name it is going under you are quite right this is one of the possibilities that my plant could be.