Subjuntivo problem sentence.

Question

Hola! I would appreciate some help translating this sentence. I want to say, " I had a great time there but now I wish that I had taken this class before my trip to spain."

Here is what I came up with but I am not sure which one is right:

Tuve un buen rato allí pero ahora deseo que tuviera esta clase antes de mi viaje a España.

Tuve un buen rato allí pero ahora deseo que tenga esta clase antes de mi viaje a España.

Please help

Answer 1

In this case I'd use "hubiera tomado" for "I would have taken" (the past perfect subjunctive).