I'll check it all out next time I go out. I think I have the HJ rad support with the WB radiator mounts but can't be sure of that. Should have some headlight surrounds there somewhere.
Drop us a line next time you're coming up to Canberra.