Hi there,
Just to chuck in my two penneth worth...
I think a morning A of 8h on a short night is too much and is likely to make him more OT perpetuating your sleep problems. Also iiwm I'd stick to a max 13h dy and perhaps do something like this:
WU: 5am
Nap: 12 (capped at 1.5h)
BT:6pm
My theory is this, if you can get a couple of good nights and on top of the it you'll have more chance of success in pushing the nap and BT out
What do you think?