Ok I do think it is Caleb because the scene in this last issue was pretty much ointless other that remember his existance

I however think Riley will be above (rank wise) being all govermenty like... plus it is so like Joss... big bad going straight the next season (Spike season 2 and 4 and tehn in 5, 6 ,7 ) , and good guy becoming big bad the next one (Angel season 1 and season 2)

I for one don't want to see Xander heart broken again (although we all know it is inevitable) but maybe there will be someone heart broken enough to have a revenge demon summoned and ANYA is back..... yes I am still hoping for her to show