The trainer we have coming over to the house also does an adult class at a local store (can't mention name, trainers aren't supposed to work on the side) so Luca can have well supervised socialization time there.
I think you're right. Trainer is best for Luca.