Duncan,
After going to the trouble of getting the engine out and heads off, I'd consider just sliding some new pistons in as a bit of a cop out.
I'd also kick myself later on if I wanted to up things even further and had to do it all over again.
nick