Good to see you back, I really liked your game from last year's jam! It sounds like you're working on something pretty fun. Set encounters are better than random encounters for games with puzzle elements in my opinion. Don't get too bogged down with the more complex systems, simple with lots of content is usually better than the opposite.
Best of luck with this years game, I'll enjoy trying it out!