Aaaaahhhh, thankfully it all worked out - I entered the provided unlock code while I was in the store, and it worked!

Now I can put a custom ROM on this sad old S6 and give it a bit more life without worrying about the original stock ROM or having to remember which carrier it was originally with.