Hi,
I think that is the best idea, picking the latest single.php and apply the changes you made in the previous version.
Probably you know this but you can use a tool like KDIFF to check the differences between the old single.php of the parent theme with the one you modified to isolate you changes.
-Rui