I was in exactly the same situation. I bought a freshly rebuild 2006 3.3 HPDI in 2009. It ran great for 6 years then blew. Both times it was a locator pin failure with the Yamaha pistons. I decided to rebuild using Hydro Tech after talking to them. They used different pistons which they said have been very reliable. I think they are WSM pistons. I removed and shipped the fully dressed power head to Hydro Tec. The whole process went great and the cost was a fraction of a new. I'm very happy after 5 years.