You could also get a few inexpensive heat sinks from Fasttech, if you don't mind how they look and it's a tight squeeze. I don't enjoy "tight squeezes" personally as it can make it hard to do things like move the airflow around, unscrew and etc. I'd say get the tank, but maybe a heat sink or two, in case you find it an uncomfortable fit. It should FIT, whether it will be a comfortable fit or not, I'm not entirely sure.
Best of luck,
Anna