My guess would be using Tower 2 for both catches. It will take multiple orbits for the ship to pass over the launch site again, so that gives them several hours to safe the booster and transfer it to a stand. If they encounter any issues with the booster, they'd probably still have backup options for ship splashdown in the ocean.

Not sure exactly what the status of the Pad 1 chopstick upgrades are (or what the status would be in a few weeks), but as the flame trench is still under construction, it seems as though Pad 1 will be an active construction for the foreseeable future.