Hi Pete,
Yes, the 2SA1145 looks closer for the Vas PNP. Have a look at the Ft /Ic how it peaks to 200MHz around 10-20mA.

Multimedia File Viewing and Clickable Links are available for Registered Members only!! You need to

or

!!
It's still only 800mW so a heatsink would be nice. Gain is also a bit low so I would select a high Hfe one or go for the Y grading.
The 2SC2705 is fine also for the CCS. One caution though, these are only 50mA rated and the PNP Vas could easily be blown in the Vas position under overload conditions, without a current limiting emitter resistor as I've added.
Greg