Plans sound good! I'd have gone t28bb if I had the choice!
Did test cranks this morning and confirmed spark and injector pulse. I'm froffin'!
Only problem, the starter was cutting so hopefully it's just a voltage drop or else changing that is near impossible haha.
Beer time.