Lithium ion batteries are increasingly important in large scale applications where thermal management is critical for safety and lifetime. Yet, the effect of different thermal boundary conditions on the performance and lifetime is still not fully understood. In this work, a two-dimensional electro-thermal model is developed to simulate cell performance and internal states under complex thermal boundary conditions. Attention was paid to model, not only the electrode stack but also the non-core components (e.g. tab weld points) and thermal boundaries, but also the experiments required to parameterize the thermal model, and the reversible heat generation. The model is comprehensively validated and the performance of tab and surface cooling strategies was evaluated across a wide range of operating conditions. Surface cooling was shown to keep the cell at a lower average temperature, but with a large thermal gradient for high C rates. Tab cooling provided much smaller thermal gradients but higher average temperatures caused by lower heat removing ability. The thermal resistance between the current collectors and tabs was found to be the most significant heat transfer bottleneck and efforts to improve this could have significant positive impacts on the performance of li-ion batteries considering the other advantages of tab cooling.