Both of those tires would be great choices. I've been using Panracer Gravelkings I made tubeless and they've been great over the past couple months since upgrading as well. I think if you're able to make either tire tubeless you'll be saving yourself some headache in the long run.