I appreciate the advice and experiences, it really helps. I do like that the new facility offers a wider range of free classes than my current place, but I will use caution with whatever I decide to do. Working with my trainer I know what I can do with weights to provide at least a decent workout without tweaking my neck - and we've worked enough with TRX that I am pretty confident that I can avoid further injury with that.

I will set aside trying out the Yoga until some later time perhaps. I do, finally, start physical therapy for my neck this week to strengthen it. It does make sense that this isn't the time to take on something totally new as I don't need to risk further neck injury.