While the NAA is an option I am an old school gear head believer too.

There is no replacement for cubic displacement.

I would choose the 380. There are a lot of high quality 380's for around $300.