Only you can answer that!!!
I rekon rigid is faster and easier for good tight and twisty singletrack, its certainly noticeable uphill, because of the wieght or bobbing bit I am not sure…
I did 12h night event fully rigid at Thetford, it was great but steel forks that were too short and of the jump variety so more rigid than the name would suggest, coupled with crap lights meant I spent a lot of time hitting roots I couldnt see instead of getting the front over them, it put me off rigid for quite a while…. or at least untill the swelling went down, moved onto carbon rigids after that and the differnce in comfort was quite noticeable, and so feather light it made the bike just feel alive, assuming you dont have carbon on it, then it would be a great move and way cheaper than a set of medicore forks.
There is certainly room in your life for both bikes that for sure!!!