I'd second the vote for a switch to T4, providing Joe has the time to do that. I actually broke down and bought the cheapest CodeSmith license a few months ago to get going, but I agree that it would be great to have a Visual Studio integrated solution instead. Now that mojoPortal deployment has been brought inside VS, maybe it's time to bring the code generation inside too?
Oleg Sych has a ton of T4 articles on his blog. Scott Hanselman has a pretty comprehensive overview of T4 too.