Prompt [Q] Restoring Stock Partitions

A while back I converted my e970 to an N4, afterwards I also did the 8gb to 16gb conversion as well. I have since converted back to "stock" however my partitions aren't quite the same as what I believe to be stock. Another stock dump.

Can anyone suggest a process to restore my partitions back stock / true?

Here is where I am at currently, partition wise:

Code:
~ # ./parted /dev/block/mmcblk0
GNU Parted 1.8.8.1.179-aef3
Using /dev/block/mmcblk0
Welcome to GNU Parted! Type 'help' to view a list of commands.
(parted) p                                                                
p
Model: MMC 016G92 (sd/mmc)
Disk /dev/block/mmcblk0: 15.8GB
Sector size (logical/physical): 512B/512B
Partition Table: gpt

Number  Start   End     Size    File system  Name        Flags
 1      8389kB  75.5MB  67.1MB  fat16        modem
 2      75.5MB  76.0MB  524kB                sbl1
 3      76.0MB  76.5MB  524kB                sbl2
 4      76.5MB  78.6MB  2097kB               sbl3
 5      78.6MB  79.2MB  524kB                aboot
 6      79.2MB  79.7MB  524kB                rpm
 7      83.9MB  109MB   25.2MB               boot
 8      109MB   110MB   524kB                tz
 9      110MB   110MB   1024B                pad
10      110MB   113MB   3146kB               modemst1
11      113MB   116MB   3146kB               modemst2
12      117MB   118MB   799kB                m9kefs1
13      118MB   119MB   799kB                m9kefs2
14      119MB   120MB   799kB                m9kefs3
15      126MB   134MB   8389kB  ext4         drm
16      134MB   143MB   8389kB  ext4         sns
17      143MB   143MB   8192B   ext4         ssd
18      143MB   159MB   16.8MB               misc
19      159MB   176MB   16.8MB  ext4         factory
20      176MB   177MB   524kB                encrypt
21      177MB   177MB   524kB                eksst
22      185MB   1778MB  1594MB  ext4         system
23      1778MB  2617MB  839MB   ext4         cache
24      2617MB  14.9GB  12.3GB  ext4         userdata
25      14.9GB  14.9GB  8389kB  ext4         persist
26      14.9GB  15.2GB  268MB                tombstones
27      15.2GB  15.2GB  25.2MB               recovery
28      15.2GB  15.2GB  3146kB               fsg
29      15.2GB  15.2GB  8192B                DDR
30      15.3GB  15.3GB  33.6MB               fota
31      15.3GB  15.3GB  33.6MB               mpt
32      15.3GB  15.3GB  524kB                tzbak
33      15.3GB  15.3GB  524kB                rpmbak
34      15.3GB  15.3GB  16.8MB               reserved
35      15.3GB  15.8GB  423MB                grow

(parted) check 17                                                         
check 17
Warning: Partition 17 is 8192B, but the file system is 16.8MB.            
Ignore/Cancel? i                                                          
i
Error: The file system is bigger than its volume!                         
Ignore/Cancel? i                                                          
i
No Implementation: Support for opening ext4 file systems is not implemented yet.