I've met you Scarlett a couple of times , and you have a LOT of money & effort into your accessories etc. That's commitment.
My scenario is more of a power play / strong amazon type with the mistress herself & prefer domestic setting. But there are ppl who like to lavish in more darker surroundings with props etc which works for them.
Your potential new place sounds great.
Whatever you decide I hope it works out, it will definitely give you more scope.