Nice report Alan.
Re the notchy 2nd gear change I can report that mine has smoothed out totally. I'm just about on 17,000klm and it did improve noticeably after 10,000 klms so anothe r3,000 miles should see you getting pretty close to it being right.
In fact, I only realised a couple of days ago that I hadn't even noticed the 2nd gear change for months.
I keep a spreadheet similar to what you've described (not having an on-board computer) but of course, being petrol and as I'm younger (and still hoonier) than you
my consumption is nowhere near as good.
I'm happy with it though.