After contemplating sprung intermediate buffer, due to practical considerations, an executive decision was made - fixed W/M buffers!
The tender is now complete and has temporarily been connected to the loco. The latter has had some fine strips added to the rear edge of the fall plates, to bridge the gap to the tender.
Still got to fit locating pins to the loco number and shed plates but, otherwise, I think it's finished ready for painting.
Here is the finished loco, face to face with a later class mate.