Thanks to Mr.
Kumagai (aka P I N K T A N K) and Yokoyama san, SAFS joint upgrade sets will be available.
I have a few of PINKTANK's items. The quality of his work is is on par with or if not better than with any big kit company - well worth the ¥ and postage.
Visit PINKTANK's site to learn how to get your hands on them
http://ameblo.jp/pinktank555/entry-11621596006.html