Electricity Infrastructure Investment Bill back before upper house next week