A thermal management system according to one disclosed non-limiting embodiment of the present disclosure includes an at least partially annular oil tank; and a fan airflow diverter upstream of the cooling fins.