iOS 18 Photos app has issues. Need fix for "Sort By Date Added" problem

This new Photos app in iOS 18 is......a struggle (running on 16 Pro). There are issues with the Sort By feature. I have to change the sort by function the other option every single time I open the app due to it not remembering the last selection. Is there no way to make it remember? Additionally, when I select the sort by Date Added option, it will ONLY sort the photos either taken by this current phone or added to the Camera Roll after having switched to the current phone from my previous 13 Pro, which completely defeats the purpose when it considers every photo added to the camera roll from the old phone as having the same Date Added date when transferring everything over to the new phone after upgrading. What is the fix for this, if there even is one? I have over 14,000 photos, so going through each of them and changing the metadata doesn't seem practical. Any fix for this? iOS bug?