PMB's Botaim is already included in PB2.6mm code by sPlOrYgOn since about 2 months (if I remember good). The same about removing AIM_OFFSET (already done).
About jumping WP - we were already speaking about this, too. The problem is You never can't be 100% sure the jump is possible to do until You-self do this jump. That's why still exist this system. If You have some problem making jump WP's - maybe ask SoUlFaThEr - he is the biggest specialist of jump maps and WP's for them.
But I saw something at [E]PODBOT forum - You started learning C++ - so maybe You can implement this in bot-code and try if this is a good idea or not (sPlOrYgOn seems be busy now)?