Our rule with Loki used to be no naps after 7pm
Now I let him sleep whenever because he's lazy and probably sleeps 18 hours a day, including all night...
Sammy has the same problem. Also, try feeding later in the day. The earlier mine get dinner the earlier they want breakfast!!!