Have you checked Gap? They sell separate pj shorts/pants and shirts.