Something like this might be suitable... most 20mm inrunners are too high Kv for direct drive with anything bigger than about a 4" prop.... but this 65g/24mm one should be good, on 2s or 3s depending on what size prop can be fitted:
http://www.giantshark.co.uk/bs204012...-p-407692.html
If the original 400-powered plane had a 6" prop (probably on 2s), this motor could manage that, certainly on 2s, but with ferocious power on 3s.
I think their 385W is a mis-print or else hugely optimistic... but <20A should be okay.