Looking at the aquarium cabinet I remembered the panels are made of aluminium, turning the cabinet into a metal box (with the side to the wall being open). Some testing with the KAKU remote clearly showed a severely reduced range when the cabinet is closed. Leaving it open is not an option (cats). I have a couple of ideas on how to fix this but would like some feedback

Option 1:
Better antenna for the rfxcomm. Don't know where to get this, but should be the easiest change.
Option 2:
Domoticz with rfxcomm on a rbPi in the living room. Most switches will be near the living room anyway so this might not be a bad idea.
Option 3:
Slave rbPi with switching hardware in the aquarium cabinet (with wifi). Wifi accesspoint in the living room probably can reach inside the cabinet (need to test with phone) and the rbPi can switch multiple things.
I'm leaning towards #2 as this would be quite easy to achieve and have a high chance of success. Any other options I'm forgetting?