It was a quandary, the only one to decide how to resolve it being me, and one I can give an update to now.
I wasn't going to chance an OR engineer visit again, so I found an independent telecoms engineer. I was very lucky and found the type of 'old school time served clever and skilled sort who was clued up and knew what he doing' engineer. Emailed him a link to this thread, then rang and talked on the phone, agreed between us what to do, and made an appointment, which was for this morning.
He was just the kind of engineer you want, showed me pics on his phone of some of the wiring horrors he's been called out to resolve, so by comparison my job was simple. The redundant NTE5 and filters now gone, nicely crimped, and blanked off.
After reconnecting the max attainable rate went up by approx. 1.5Mb/s (35248-36212) and actual connected line rate from 29809 to 31381, the acid test (download speedtest), went up from 28.32 to 29.95 Mb/s. This latest result was the same figure we got when the OR engineer did tests during the installation, and it had just dropped a little since then, and today its gone back up and the only time since then that I've seen at that rate again. Regardless of that it's neater and now wired as it should be.
I think they are very good results anyway for 800-900 meters from the cab, and having had Infinity installed for going on for 3 weeks now I'm hoping that's a 'stable' result.
I've attached two sets of graphs, one taken yesterday, and one today after the rewiring. The one from yesterday seems to be missing a group of tones, I'm wondering if that would be due dropping them over the time the modem was up, around 15 days or more, when the line quality at some point wasn't so good, maybe night time interference?
Thanks for all the tips and advice, glad I got the work done.