Thank you Dgibs! I had come to the conclusion that separate accounts were probably easiest to track. The flow chart is exactly what I needed to point me in the right direction, thank you. I will be discussing short and long term goals with DH asap.
As a side note, following a quick investigation into our actual pension funds this morning, I found an old work pension with over £18K just sitting there compounding away. Well done 18-year-old me!