He had two short naps and a better night last night.
Your right about trying to help him be more indep at naps and BT. Last night I tried to resist when he woke about 1.5hrs after BT but the screaming was so bad and DD is ill ATM and me knackered I gave in and fed but tried to stir him when I put him down so he wasnt asleep at least. So he woke aroud 8, 1.30 and 5.30 which is better (better than 10, 12, 2, 4.30 and 6.30 mornig anyway!). Will keep working on it.