I love FnS HWs and they have worked well on Max. 2 hours is pretty good for a fitted TBH. Trouble with FnS is there isn't much room to boost them.
DnF don't come with as-thicker-a-liners as FnS but they do have much more room to allow boosting so they could be worth a try. Otherwise WNNN as day nappies are good and I also use Bedbugs as I get around 3.5 hours from them on Max.
LLS HW and SHW's are good but these will be hard to come by now that Amber is due her LO soon.
I had about 2-3 months of super-super heavy wetting with Rufus between 6-9 months, I was having to change him every 2 hours and overnight we could just manage with a WNNN or LLS HW with a Puddlekins Zorboost & a couple of pieces of zorb from the sheets I bought from Lush Tush ... then he started cutting down on his milk & eating a lot more & his wetting is finally getting a bit more manageable now at 10 months.