l96 barrel

hey i just want some opinions/help on a build im working on currently: mancraft sdik @100psi shooting ~500fps with a .2g AA hop up chamber ~~~~~~~~~~~~~~~~~ g&g green bucking maple leaf nub AA 510mm barrel I just want some help where to go from here with the bottom 3 items, I do not feel...

Does anyone know anywhere to buy new stocks and outer barrels for Maruzen style type 96's - pref. Europe - or which clone comes with a sturdy stock and barrel so I cant replace the tacky plastic and thin barrel on my clone (I'm not sure which rifle I own as it's second hand). Also would be nice...