Alternative title: Would you run screaming if you saw me coming through the door?

So, I've got a fairly informal dinner coming up soon. Just a few colleagues on a nice get-together at a wok restaurant. Nothing fancy.

I've got this outfit picked out so far, but I'm afraid I've no great eye for fashion, and may need a nudge (or a kick in the you-know-where if a nudge won't help):

Wallace Dress tartan (it's a rather dark dye-job, mind) with a simple black leather sporran (it's all I've got and I'm out of budget for another one!). Black kilt hose with (weathered) red flashes to match the tartan's red. Also a simple sgian dubh for in the hose. Nice black shoes to finish the bottom off.
Fairly straight-forward. Now's the iffy bit.
A rather nice gold-ish yellow dress shirt. It closely matches the yellow in the tartan, but now I'm afraid it might dominate too much... I do have the ability to tone it down a bit with an anthracite coloured five-button waistcoat, but I've no jacket to go with the waistcoat.

So, here's my questions: Should I swap the yellow shirt out for a white one, and switch to cream kilt hose? Or do you think I could make the yellow shirt work?
And will a waistcoat alone look out of place? I think I might be able to dig up the jacket that went with the waistcoat but: 1) it's most likely way to small by now. 2) it wasn't bought with a kilt in mind.

I'm definitely NOT doing a tie, though. Not a tie-guy, and I'm afraid that'd be dressing up WAY too much anyway.

I'll try to get pictures up later, if I can and if you need them. I hope you can visualize without though.

Thank you for the help!