What i did and it kind of seems to be working is adding checking for Wi-Fi connection using Iphone Wifi extension (ignore the iphone name, works with android phones as well), and adding Combined Presence App to create a Virtual Presence device that combines difference presence sources.
It's a bit overwhelming at start when looking at it, but is actually much simpler once you start follor the instructions.