You 'could' probably do both of those things, but it would probably be more cost and effort.
Look up underneath and see if you have an empty bay between the frame cross-members. I suspect you do, my X19H has an empty bay. BUT keep in mind that you wouldn't want to travel very far with all tanks full. At 8lbs/gallon, a 30 gallon pony tank will be 240 lbs plus the weight of tank and plumbing off of your CCC.
You also might be able to get a slightly larger tank into the bay. The tank on ours does not fill the space. But that might be an issue with all of the replumbing required to get the inlets and outlets placed correctly.
Take some measurements and see if Icon has something to fit:
https://www.icondirect.com/waste-holding-tanks/
ETA: check out the install video on the site; pretty good instructions for measuring and ordering all of the fittings required.
Assuming your boodocking site still sanitation dump nearby, the easy solution is just get a tote tank and dump mid-week. We generally go about 4-5 days before filling our tank and then just spend an hour hauling the black then grey to the dump station in the tote. The totes aren't overly expensive and require no modifications to the trailer.