This is my preference as well. Gives you the option of looking at the nice manicured "this is how I wish it happened" view, and when needed/helpful you can dig into the nitty gritty of what really happened with all its false starts and mistakes.

But most orgs don't do that, so rebase it is.