Yes, I believe now you're getting somewhere! He doesn't need that catnap anymore. I would give him 3hr A, nap, 3hr A, nap, 3/3.5hr A, bed. How many bottles is he getting now? If he's on 5 during the day, dropping to 4 will definitely help. If he's already on 4, it's probably time to wean the night feed. Keep the 12hr day 12hr night though. If he takes a 2 hour AM nap you may need to wake him after 1.5 hours from the PM nap to preserve bedtime.