The complexity of the metal-hydrogen interaction and the critical role of thermal management in a metal-hydride storage tank necessitate comprehensive mathematical modelling before a suitable design can be chosen and subsequently implemented. Existing models have been analysed and integrated into an enhanced model which incorporates several features more suited to practical applications using an intermetallic metal-hydride tank. These include matching initial conditions of the model to physically achievable experimental conditions, the ability to vary the cooling system fluid temperature and realistic modelling of hydrogen injection and extraction from the tank as well as incorporating the non-ideal gas equation and modifying the equilibrium pressure and effective thermal conducting equation based on experimental data.