I agree. I know Ady liked Rogue One, so perhaps the Imperial theme from that film (ending as it does with the four-note flourish used in ANH) would suit.
I have no problem with using the Imperial march in ANH:R as such, but I agree with saving its full, bombastic statement for ESB.