yeah. like you've found out. 1 month is more than enough time. 2 weeks is fine. no one is going to trash you for that. and waiting until after bonuses are announced is standard practice among most retirees and folks looking for a job. i know this because i worked in it recruiting for the 5 years preceding my hike and my phone would go banana's in february. all of a sudden everyone knows a guy i helped find a job and they're all looking to make a move.
in that 5 years i can't remember a single person getting stuck with a bad deal because their new job wants them in 2 weeks and their old job thought that wasn't enough time for a transition. people change jobs. people quit jobs. if a company can't figure out how to make a manageable transition in 10 working days they have bigger problems than you leaving. like you said, you've already moved up into your old boss's job in what was at the time probably a quick fix to their departure or promotion. i'm telling you, i hired help desk guys through lead developers and up to the CTO level at a hospital (a notoriously slow business to hire for) and no one balked at giving their current jobs 2 weeks if that's what their next employer wanted....and like i said, no one (that i can remember) got burned for that.
but it sounds like you've got your dates figured out. it feels great, doesn't it? i'm just going to leave this here because i'm sure it's a question that a lot of hikers will be working with over the next few months.