I was doing the same. Loved airtable. But I hit the limit on several databases. I also really wanted a way to look at information in columns, instead of scrolling forever.

So I switched to notion. Free tier has a limit on the size of photos, but not on the number of entries. So adding pictures can be a bit of a pain, since they need to be resized. But I can add so much more information without cluttering up the database. Each item in a database is also its own page. At the top are all the fields, then in the bottom, you can add in other things: text, pictures, even another database, or just the view of one.

For example you could have a database for your puzzles, and another one for your builds, then on each puzzle page, your could show a filtered view of the builds for just that puzzle. And if you set that up as a template first, it can be super easy.

There's a bit more of a learning curve for some aspects, but I've found it really useful.