Unless you have to boat to your base, just have that 2 star chase you home. Up to you if it's worth it. You can make a pen elsewhere but that may quickly become a pain.

Don't wall in your surtling spawn. The walls are probably preventing the spawning. Just dig so there's water all around it. They spawn, they die, you go hop in the pool and collect. IIRC they spawn every 5 RL minutes if you are in the area.