Baby Schedule

Shelby
Do you have your 6/7 month old on a routine/schedule? Would love to hear what other mommy's are doing out there! 
My little guy eats every 3-3.30 hours, naps every 1.45-2 hours. His morning nap is always his shortest, 30-40 minutes, so I am wondering if I need to adjust something to get him to take two solid naps and then a cat nap later in the afternoon. Sometimes he takes 4 naps a day still, with a 7:30 bedtime. 
Another question - if your baby wakes up earlier for the day, do you try to keep your nap times consistent? My baby typically gets up at 6:30, and on the rarer occasion 6. So on days he gets up at 6, I start our wake time window and adjust accordingly for nap times but don't change his bedtime time. Is this what you do?