I think in their next encounter luffy will have a solution for his Haki along with a new form or Gear 5.
If Oda will show G5 now then he will unlock awakening in final war if not then he will unlock G5 in final war and there will be no awakening for luffy.
If Oda will show G5 now then he will unlock awakening in final war if not then he will unlock G5 in final war and there will be no awakening for luffy.
Ultimately Zoro's intervention might be required.