Have similar setup . VDSL2 modem in basement next to NAS , Router with AP upstairs . Check my config (DSA) if this could be suitable for You