Issues with 'Remapping Grid Cells' and 'Interpolating Point Cloud'

I have a couple of issues with the definition that I can't seem to work out!

I have a parameter named Cell Size (Set to 5.0) which went adjusted changes the size of a square grid but does not adjust a remapped control point unless I add the express x-1 to the Square Grid but I'd like this to be full parametric. (First Image)

Secondly, the final outpoint of a point cloud is used to make a Surface from Points, I have tried to Partition the list to interpolate the points to create a Grid but I'm struggling to re-organize the points into rows/columns without the Interpolation being continuous.

If you could help/have any suggestions it would be greatly appreciated!