Not sure how much help I'll be, but how about dreaming of herself and Ichika as co-teachers? Ichika can act much suave-r than usual, almost like a male version of Chifuyu, which is unavoidable since Chifuyu is
GAR. 
The alternative would be to reverse it, as in having her and Ichika as classmates, but I think the first one is much better.