Fair enough. Yeah, I wanted to split it in to specific updates but in fact because the original commits were not structured that way it became impossible. Lesson to me: structure change at one-change-per-commit!
PS. Rather than duplicating the changes, good git UIs often have a 'cherry pick' interface that lets you pull these things in bit by bit. I know SourceTree (my UI of choice for more complex VCS processes) has a great one. Unfortunately it also fails to provide the same functionality in patch generation... so I couldn't push these things to you as serialized patches one by one (my original wont). I've opened a bug with them to add this, they've been really responsive in the past so hopefully this won't be an issue in future.