Hi folks,
My starting issues when the engine is hot seems to have been as simple as not having enough you CCA, I replaced the 540 CCA battery with a new 620 CCA battery and she fires immediately now regardless of engine temp.
Thanks for all the advice.
Cheers,