Yeah, running the cable will be simple and I promise to be neat. ;)
So, to summarise:
2.5mm heat resistant (butyl) cable would be preferable to the 1.5mm HR I have. However, the 1.5mm HR cable is still preferable to the 2.5mm, non-HR T+E*
I'll also be going direct to the switch...