Have you thought about a 3.4 swap? That's what I will most likely do when my 3.0 dies if it ever does (hope not for a long time!).