Make Kyon a little less perverted and a little more psychologically damaged and I think the personalities would match perfectly.

Mikuru is closer to Shinji, really