Hi Mark.
Had virtually the same problem when i bought my 4/4 2 years ago.Had the battery tested and was said to be ok,replaced the starter motor with a new one.Still had the problem with intermittent non starting,replaced the battery with a new one and have not had a problem since.It appears to me that batteries can sometimes pass all tests but when under load on the car can fail.perhaps if your battery is more than 2-3 years old it is worth replacing anyway.Its also worth putting an extra earth strap between the bulkhead and engine gearbox casing. Good luck Barry
78 4/4 4 Seater