I don't know if this would be pushing it, but have you considered using switch lite batteries and maybe screen? Might be too late for the screen part and the old battery is fine, I was just curious if it might make the whole process easier to source.