Thank you all,
I actually managed to squeeze stuff in, shortening manually the bars on the GANTT chart (I honestly, didn't know you can do that) to end in 2 weeks time, and than by leveling all. Right now it seems fine, and I hope it will continue to be so.
Thanks again!