I think you’re actually in a good spot Lael Davis. I happen to work in a CS department now, and know what high demand degrees are in. That demand will give you choices, which could allow you to carve out a better INTP niche.

I’ve read that hip start-ups trying to attract talent are beginning to offer much more flexible work environments — that might allow more time for hobbies.

But another big consideration is that CS is now so hot, especially around AI and ML, that you could parlay some experience into working on projects you care more about — like some non-profit cause, local government, or a more off-beat industry (e.g. fisheries; or fashion). Then you can get into some domain knowledge, besides pure coding.

That all assumes you won’t hate coding in four years, which we can’t know. But as an interim strategy: finish your degree, and see if you can get a work situation offered that appeals. If you can’t, maybe go for an MS.