Too bad about the short shock / tall upper shock mount combo! Maybe using some wide aluminum bar as a spacer in the cup could be an option? A hole in the bar, and threaded rod and a coupler (plus a bunch of red thread locker) could extend the shock threads, essentially making a super thick flange. Or, drill out the studs, use longer bolts and machine a quick spacer.

I bought some Bilstein B8 shocks and the tall upper shock mounts - hope they work or I will have to figure out something.