[Q] trouble finding edited photos after update topic

Running a stock Nexus 6 w 5.1 lmy47d on T-Mobile in case it matters. At some point over the last couple weeks it seems that Photos has been updated (or at least the gallery view part of it) so that photos I've edited replace the original photo instead of showing up as a new image. That's in Photos, where selecting the edited photo gives me the option to view the original by clicking a little button.

When I'm trying to post an image on fb or text it to someone, however, I can only see the original image with no way to find the edited version. Needless to say the various folders and navigation options for locating images were already confusing, but this really messes me up. Is there a way to turn this "helpful" feature off? Why can't photos just all be there? Why are edited images no longer stored under On Device? Where is everything.......?

Arggggh.