My guess; you're right; IMO it's a Buckley revamp;
standard Buckley with cut-down award plate and JP trim added;
looks like there's no glass in JP window; a card or painted glass should have indicated what the Extra Award was;
doubt very much it was done by Buckley.