Brewster Buffalo,
"Is the intention still to retire the Beechcraft Shadow aircraft next year as well?"
Nope. They are being upgraded to R2 standard, and the fleet is being expanded by turning the trainer a/c into an operational machine and acquiring two more.