I'm a big fan of the look you have put together. I agree that a black shirt is not traditional but what the heck.....:P

If as AA says you need wicked green accessories I'd try to get matching tie and garter ties in a green that tones with the green in the kilt.

Other than that I wouldn't change it.