i'm doing the same swap but haven't got to this stage yet so interested to see how you get on. I've got a 1992 oil cooled GSXF engine which I believe has the 36mm, I haven't looked at the carbs yet.
Tail looks great, wish I had done that with mine originally!