Guess U are considering direct replacement in size, the CC Upgrade with fan, a few $s (Tube & Fin core), good piece of work and be also suited for follow on upgrades if U end up doing more.