I think you are looking for a 'leine' (long shirt with big sleeves) and an 'ionar' (short doublet with separate attachable sleeves). These are often considered Irish garments, but go very well with SCA and Renaissance era great kilts.

Pictures anyone? (if not, then perhaps I will have to take some myself...)