Hi Lauren,
how much day sleep would you wan't him to have? nap#1 2h, nap#2 ? Is late nap pushing BT later and later?
About crankiness ;] My DS is often not in the mood even if he wakes by himself. I find 3 things helpful:
1. I smile and sing happy songs no matter what. Sometimes he smiles along. But you probably want to be gentle with that if you're waking him up.
2. I pick him up from the crib and lay down with him for a while in our bed. Even if he jumpes and rolls over I keep laying.
3. I pick him up from the crib, open shades and let him stand in the window (I hold him, but it's probably not the best parenting advice;) . I show him animals, cars, trees etc. I talk a LOT!