Just updating things, with help from Steven Levine, I fixed the trap very quickly. I then found I had to implement some more stuff. I think I'm VERY close, but at this stage, still no working HDA.
I just need to find the last bit of missing glue - hopefully soon - as I've spent way too much time on this over the last couple of weeks...