I've been running the yelllow replacement Bils for many years.  They are still great shocks, but are likely past their prime.  I've always thought they were a good all around shock.  I'm putting Ball Joint spacers and Cruiser coils on soon and I need loner shocks.  I have the same issue with the top mount being the bayonet style.

I've been looking at the OME LTR shocks.  They have models with a bayonet mount and feature the remote reservoir.  Expedition Exchange has pics of them on their site showing the bayonet mount for Rovers.

http://www.arbusa.com/ltr_shock_absorbers.htm

I can't seem to find a fitment guide anywhere though.