How about adapting the four volumes that were released after Flash?
Keep the looks close enough to Yas's designs aside from making Kei distinguishable from Amuro.