Splash never fit Frontierland thematically, but changing it to New Orleans Square doesn’t work either since BTMRR would then be completely out of place. Just leave the front half of the River, dock the boat across from Tianna’s and make it a restaurant.