The MOE handguard will fit a mini battery. It will fit a mini nunchuck battery if you install a rail on the bottom of it, too.
Those guns are the same, HaW and the Army Navy store are connected.
Get the KWA over the ICS. ICS has lots of proprietary parts and changing/upgrading is a pain in the ass.
I change primaries like other people change socks.