I think your fingering chart has some really good ideas in it.
Especially Rule 6: Raising the L1 for higher octaves would faciliate the work of the left thumb on the octave keys greatly (lifting/shifting). This should also work for the whistle fingering, or?