I hear you on the reboxing let-down, I had a similar experience when I decided to do a Tamiya Mobelwagen and replaced the kit gun with one from LionRoar/GWH...it was the exact same gun just with a metal barrel and some PE upgrades. :)
Ostwind is always a fun project, look forward to seeing...