A380 is unlikely to be reactivated but it's possible. There's also some new orders coming with F soon.
LH J product is indeed well behind times, again new product should start coming soon. In the meantime, you can hope for one of the several airplanes (mainly A350s) leased from other airlines with their superior J product.