I thought about #1 long and hard, sigtrent. In the end I've decided that losing your top level spells is simply not a tradeoff that a "cleric" would make. Now, at lvl 20, that becomes a non-issue, at which point the definitions might need revising. But it's easier to think of someone willing to sacrifice a whole level of spellcasting as a Tank-That-Heals, rather than a Battle Cleric.
Subtle distinction, but a real one. My Battle Cleric can cast Mass Heal when the cap goes to 18; the Tank-That-Heals cannot. It's a big difference.
As for #2, as I've explained above, I consider all "generalists" to be Battle Clerics, aka, Clerics.
/gren