Went to the Apple shop today. Going back tomorrow. Might be able to order the top case, wait for it to arrive and then bring the laptop in so they can do it the same day.

Might sneak in a new battery too if it goes ahead.