Well this is really weird.
Just re-installed a9lh with the modified files/installer by @liomajor (plus the other stage1 variation - payload_stage1-X-Y.bin) with works fine (sort of). Luma loads by default as expected, GW menu loads with X and system shuts down with Y pressed (to be expected, no...