In case anyone notices this issue later, I did contact the TAC and we worked it out.
Technically the older HP switches (pre-2530) are not supported in Airwave, though they kind of work. The switches imported as generic "Aruba Device", and though they had switching UIs in the Device monitor screen, they were listed as APs in the Topology.
We changed the type of some of them to "Router/Switch" and the Topology was fixed but the lighter-weight, generic UI in the device monitor had so much less functionality that I had them switch it back.
Just something to now going forward.