Nice job, Sar.  I like the GSI cup too, I just wish they offered an SS lid for it.  If you or anyone else comes across something compatible with it, please let me know. 
I don't know if they have what you are looking for, but you might check here:
http://canteenshop.com/id82.html