I have been thinking about how I can structure the data to make it more logical - your points are valid and suggestions much appreciated.

While time is a limiting factor, I'll see what I can do.

Thanks for the input.